From e984e46b83a46e428a1c010d297e707d06ea9674 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Fri, 6 Apr 2018 09:40:38 +0200
Subject: [PATCH] minifirewall: nagios plugins directory is configurable

---
 minifirewall/defaults/main.yml |  2 ++
 minifirewall/tasks/nrpe.yml    | 11 ++++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/minifirewall/defaults/main.yml b/minifirewall/defaults/main.yml
index 4f82138d..a6eaa2fc 100644
--- a/minifirewall/defaults/main.yml
+++ b/minifirewall/defaults/main.yml
@@ -25,3 +25,5 @@ minifirewall_private_ports_udp: []
 minifirewall_autostart: "no"
 
 evomaintenance_hosts: []
+
+nagios_plugins_directory: "/usr/local/lib/nagios/plugins"
diff --git a/minifirewall/tasks/nrpe.yml b/minifirewall/tasks/nrpe.yml
index bb92553e..2e8569f8 100644
--- a/minifirewall/tasks/nrpe.yml
+++ b/minifirewall/tasks/nrpe.yml
@@ -22,19 +22,16 @@
 
 - name: /usr/local/lib/nagios/plugins/ exists
   file:
-    dest: "{{ item }}"
+    dest: "{{ nagios_plugins_directory }}"
     mode: "02755"
     owner: root
     group: staff
     state: directory
-  with_items:
-    - /usr/local/lib/nagios
-    - /usr/local/lib/nagios/plugins
 
 - name: check_minifirewall is installed
   copy:
     src: check_minifirewall
-    dest: /usr/local/lib/nagios/plugins/check_minifirewall
+    dest: "{{ nagios_plugins_directory }}/check_minifirewall"
     force: no
     mode: "0755"
     owner: root
@@ -44,13 +41,13 @@
   lineinfile:
     dest: /etc/nagios/nrpe.d/evolix.cfg
     regexp: 'command\[check_minifirewall\]'
-    line: 'command[check_minifirewall]=sudo /usr/local/lib/nagios/plugins/check_minifirewall'
+    line: 'command[check_minifirewall]=sudo {{ nagios_plugins_directory }}/check_minifirewall'
   notify: restart nagios-nrpe-server
 
 - name: sudo without password for nagios
   lineinfile:
     dest: /etc/sudoers.d/evolinux
     regexp: 'check_minifirewall'
-    line: 'nagios          ALL = NOPASSWD: /usr/local/lib/nagios/plugins/check_minifirewall'
+    line: 'nagios          ALL = NOPASSWD: {{ nagios_plugins_directory }}/check_minifirewall'
     insertafter: '^nagios'
     validate: "visudo -cf %s"