allow nrpe to restart samhain as well

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/nagios/templates/inc-debian.org.erb b/modules/nagios/templates/inc-debian.org.erb
index dffba5ac9d3ccdd9099d5d1f112508e29a31df6b..13d10eaf9ca91569f71937bcdc890525dcdf1bee 100644 (file)
--- a/modules/nagios/templates/inc-debian.org.erb
+++ b/modules/nagios/templates/inc-debian.org.erb
@@ -28,4 +28,6 @@ out
 # exit code as that does not reliably tell us if the check could
 # not connect to the nrpe server or if the remote check returned not-null.
 command[dsa2_shutdown]=if /usr/lib/nagios/plugins/check_procs -w 1: -u root -C shutdown > /dev/null; then echo 'system-in-shutdown'; else echo 'no shutdown running' ; fi
-command[restart-ekey]=sudo /etc/init.d/ekeyd-egd-linux restart
+command[restart-ekey]=sudo /usr/sbin/service ekeyd-egd-linux restart
+command[restart-samhain]=sudo /usr/sbin/service samhain restart
+command[restart-ekey]=sudo /usr/sbin/service ekeyd-egd-linux restart

diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers
index 37475386da0b0c24cd703dbb775edc8a1da762d2..5cf49676fabd2fed4ef6a820fd14486525cdd344 100644 (file)
--- a/modules/sudo/files/sudoers
+++ b/modules/sudo/files/sudoers
@@ -51,7 +51,8 @@ root  ALL=(ALL) ALL
 
 # nagios
 nagios         MQ_HOSTS=(rabbitmq)     NOPASSWD: /usr/sbin/rabbitmqctl list_queues -p dsa name messages consumers
-nagios         ALL=(ALL)       NOPASSWD: /etc/init.d/ekeyd-egd-linux restart
+nagios         ALL=(ALL)       NOPASSWD: /usr/sbin/service ekeyd-egd-linux restart
+nagios         ALL=(ALL)       NOPASSWD: /usr/sbin/service samhain restart
 nagios         ALL=(ALL)       NOPASSWD: /usr/lib/nagios/plugins/dsa-check-dabackup ""
 nagios         ALL=(ALL)       NOPASSWD: /usr/lib/nagios/plugins/dsa-check-filesystems ""
 # with smartarray controllers