From 2f3b0add6d5a8ada5ad807520dd68d7e002d1d96 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Fri, 31 May 2019 17:45:44 +0200 Subject: [PATCH] nagios_isti_plugdir renamed into nagios_local_plugdir. --- library/roles/haproxy/tasks/haproxy-nagios.yml | 2 +- library/roles/haproxy/templates/lb.cfg.j2 | 2 +- library/roles/nagios-nrpe-tomcat/tasks/main.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/library/roles/haproxy/tasks/haproxy-nagios.yml b/library/roles/haproxy/tasks/haproxy-nagios.yml index b27c1268..272e0e07 100644 --- a/library/roles/haproxy/tasks/haproxy-nagios.yml +++ b/library/roles/haproxy/tasks/haproxy-nagios.yml @@ -1,6 +1,6 @@ --- - name: Install the haproxy NRPE nagios check - copy: src=check_haproxy_stats dest={{ nagios_isti_plugdir }}/check_haproxy_stats owner=root group=root mode=0555 + copy: src=check_haproxy_stats dest={{ nagios_local_plugdir }}/check_haproxy_stats owner=root group=root mode=0555 when: haproxy_nagios_check - name: Install the haproxy NRPE command configuration diff --git a/library/roles/haproxy/templates/lb.cfg.j2 b/library/roles/haproxy/templates/lb.cfg.j2 index c2b13107..509d441e 100644 --- a/library/roles/haproxy/templates/lb.cfg.j2 +++ b/library/roles/haproxy/templates/lb.cfg.j2 @@ -1,4 +1,4 @@ # Check the haproxy backends status -command[lb_check_bk_status]=/usr/bin/sudo {{ nagios_isti_plugdir }}/check_haproxy_stats -s {{ haproxy_admin_socket }} -w {{ haproxy_nagios_check_w }} -c {{ haproxy_nagios_check_c }} +command[lb_check_bk_status]=/usr/bin/sudo {{ nagios_local_plugdir }}/check_haproxy_stats -s {{ haproxy_admin_socket }} -w {{ haproxy_nagios_check_w }} -c {{ haproxy_nagios_check_c }} diff --git a/library/roles/nagios-nrpe-tomcat/tasks/main.yml b/library/roles/nagios-nrpe-tomcat/tasks/main.yml index 3c56456f..5c77436a 100644 --- a/library/roles/nagios-nrpe-tomcat/tasks/main.yml +++ b/library/roles/nagios-nrpe-tomcat/tasks/main.yml @@ -8,7 +8,7 @@ - check_tomcat - name: Install the check_tomcat plugin - copy: src=check_tomcat dest={{ nagios_isti_plugdir }}/check_tomcat owner=root group=root mode=0755 + copy: src=check_tomcat dest={{ nagios_local_plugdir }}/check_tomcat owner=root group=root mode=0755 tags: - nagios - nrpe