diff --git a/nagios-nrpe/defaults/main.yml b/nagios-nrpe/defaults/main.yml index dac40309..df56eb7d 100644 --- a/nagios-nrpe/defaults/main.yml +++ b/nagios-nrpe/defaults/main.yml @@ -3,6 +3,5 @@ nagios_nrpe_allowed_hosts: [] nagios_nrpe_ldap_dc: "dc=DOMAIN,dc=EXT" nagios_nrpe_ldap_passwd: LDAP_PASSWD nagios_nrpe_pgsql_passwd: PGSQL_PASSWD -nagios_nrpe_mysql_passwd: MYSQL_PASSWD nagios_nrpe_amavis_from: "foobar@{{ ansible_domain }}" nagios_plugins_directory: "/etc/nagios/plugins" diff --git a/nagios-nrpe/templates/evolix.cfg.j2 b/nagios-nrpe/templates/evolix.cfg.j2 index 54fe37c1..e6893912 100644 --- a/nagios-nrpe/templates/evolix.cfg.j2 +++ b/nagios-nrpe/templates/evolix.cfg.j2 @@ -23,7 +23,7 @@ command[check_mailq]=/usr/lib/nagios/plugins/check_mailq -M postfix -w 10 -c 20 # Specific services checks command[check_pgsql]=/usr/lib/nagios/plugins/check_pgsql -H localhost -l nrpe -p '{{ nagios_nrpe_pgsql_passwd }}' -command[check_mysql]=/usr/lib/nagios/plugins/check_mysql -H localhost -u nrpe -p '{{ nagios_nrpe_mysql_passwd }}' +command[check_mysql]=/usr/lib/nagios/plugins/check_mysql -H localhost -f ~/.my.cnf command[check_ldap]=/usr/lib/nagios/plugins/check_ldap -3 -H localhost -D cn=nagios,ou=ldapusers,{{ nagios_nrpe_ldap_dc }} -P {{ nagios_nrpe_ldap_passwd }} -b {{ nagios_nrpe_ldap_dc }} command[check_ldaps]=/usr/lib/nagios/plugins/check_ldaps -3 -H localhost -b {{ nagios_nrpe_ldap_dc }} command[check_imap]=/usr/lib/nagios/plugins/check_imap -H localhost