Jelajahi Sumber

Fixes/Add for different distributions

Sven Velt 7 tahun lalu
induk
melakukan
f6fe7c2572
4 mengubah file dengan 30 tambahan dan 4 penghapusan
  1. 4 4
      tasks/main.yml
  2. 1 0
      vars/devuan.yml
  3. 15 0
      vars/sles-11.yml
  4. 10 0
      vars/void.yml

+ 4 - 4
tasks/main.yml

@@ -8,10 +8,10 @@
 - name: Gather OS Specific Variables
   include_vars: "{{ item }}"
   with_first_found:
-    - "{{ ansible_distribution|lower }}-{{ ansible_distribution_version }}.yml"
-    - "{{ ansible_distribution|lower }}-{{ ansible_distribution_major_version }}.yml"
-    - "{{ ansible_distribution|lower }}.yml"
-    - "{{ ansible_os_family|lower }}.yml"
+    - "{{ (ansible_distribution|lower).split(' ')[0] }}-{{ (ansible_distribution_version|lower).split(' ')[0] }}.yml"
+    - "{{ (ansible_distribution|lower).split(' ')[0] }}-{{ (ansible_distribution_major_version|lower).split(' ')[0] }}.yml"
+    - "{{ (ansible_distribution|lower).split(' ')[0] }}.yml"
+    - "{{ (ansible_os_family|lower).split(' ')[0] }}.yml"
     - "defaults.yml"
 
 - include: user.yml

+ 1 - 0
vars/devuan.yml

@@ -0,0 +1 @@
+debian.yml

+ 15 - 0
vars/sles-11.yml

@@ -0,0 +1,15 @@
+---
+monitored_packages_mp:
+  - monitoring-plugins
+
+monitored_packages_np:
+  - nagios-plugins
+
+
+monitored_packages_nrpe:
+  - nagios-nrpe
+
+monitored_nrpe_basedir: /etc/nagios
+monitored_nrpe_pidfile: /var/run/nrpe/nrpe.pid
+
+

+ 10 - 0
vars/void.yml

@@ -0,0 +1,10 @@
+---
+monitored_by_nrpe: False
+
+monitored_packages_nrpe: null
+
+monitored_packages_mp:
+  - monitoring-plugins
+monitored_packages_np:
+  - nagios-plugins
+