diff --git a/roles/base/tasks/sudo.yml b/roles/base/tasks/sudo.yml index 6e42fec..d00e460 100644 --- a/roles/base/tasks/sudo.yml +++ b/roles/base/tasks/sudo.yml @@ -21,7 +21,6 @@ _nrpe ALL=(root) NOPASSWD: /usr/local/libexec/nagios/plugins/check_ipsecctl.sh _nrpe ALL=(root) NOPASSWD: /usr/local/libexec/nagios/check_mailq _nrpe ALL=(root) NOPASSWD: /usr/local/libexec/nagios/plugins/check_ospfd_simple - _nrpe ALL=(root) NOPASSWD: /usr/local/libexec/nagios/check_dhcp validate: 'visudo -cf %s' backup: no tags: diff --git a/roles/base/templates/doas.conf.j2 b/roles/base/templates/doas.conf.j2 index 0d313a5..52db062 100644 --- a/roles/base/templates/doas.conf.j2 +++ b/roles/base/templates/doas.conf.j2 @@ -9,3 +9,4 @@ permit nopass _collectd as root cmd /usr/sbin/bgpctl permit nopass _nrpe as root cmd /usr/local/libexec/nagios/plugins/check_ospfd permit nopass _nrpe as root cmd /usr/local/libexec/nagios/plugins/check_ospf6d permit nopass _nrpe as root cmd /usr/local/libexec/nagios/plugins/check_pf_states +permit nopass _nrpe as root cmd /usr/local/libexec/nagios/check_dhcp diff --git a/roles/nagios-nrpe/templates/evolix_bsd.cfg.j2 b/roles/nagios-nrpe/templates/evolix_bsd.cfg.j2 index 4b492aa..f853d4f 100644 --- a/roles/nagios-nrpe/templates/evolix_bsd.cfg.j2 +++ b/roles/nagios-nrpe/templates/evolix_bsd.cfg.j2 @@ -30,7 +30,7 @@ command[check_openvpn]=/usr/local/libexec/nagios/plugins/check_openvpn command[check_pf_states]=doas /usr/local/libexec/nagios/plugins/check_pf_states command[check_carp1]=/usr/local/libexec/nagios/plugins/check_carp_if carp0 master command[check_mem]=/usr/local/libexec/nagios/plugins/check_free_mem.sh -w 20 -c 10 -command[check_dhcpd]=sudo /usr/local/libexec/nagios/check_dhcp -i INTERFACE -s IP -u +command[check_dhcpd]=doas /usr/local/libexec/nagios/check_dhcp -i INTERFACE -s IP -u command[check_smb]=/usr/local/libexec/nagios/check_tcp -H IPLOCALE -p 445 #command[check_ospfd]=doas /usr/local/libexec/nagios/plugins/check_ospfd #command[check_ospf6d]=doas /usr/local/libexec/nagios/plugins/check_ospf6d