From f6fe7c2572bfdd195021dff727b9d852e9eed303 Mon Sep 17 00:00:00 2001 From: Sven Velt Date: Tue, 13 Mar 2018 19:05:20 +0100 Subject: [PATCH] Fixes/Add for different distributions --- tasks/main.yml | 8 ++++---- vars/devuan.yml | 1 + vars/sles-11.yml | 15 +++++++++++++++ vars/void.yml | 10 ++++++++++ 4 files changed, 30 insertions(+), 4 deletions(-) create mode 120000 vars/devuan.yml create mode 100644 vars/sles-11.yml create mode 100644 vars/void.yml diff --git a/tasks/main.yml b/tasks/main.yml index bcaf4e5..2ff914c 100644 --- a/tasks/main.yml +++ b/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 diff --git a/vars/devuan.yml b/vars/devuan.yml new file mode 120000 index 0000000..f1a5a89 --- /dev/null +++ b/vars/devuan.yml @@ -0,0 +1 @@ +debian.yml \ No newline at end of file diff --git a/vars/sles-11.yml b/vars/sles-11.yml new file mode 100644 index 0000000..553140f --- /dev/null +++ b/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 + + diff --git a/vars/void.yml b/vars/void.yml new file mode 100644 index 0000000..27c15cf --- /dev/null +++ b/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 +