Add event_handler hooks to sudo and nrpe.

We still don't actually call it yet - we need to ship a new version of
dsa-nagios-checks and then add the event_handler stanza to the entropy
check.
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 1da5548ff648101c384c1ac8de799f78108cb176..9a4ca42868a98ca5752899972923fd6fa7d0ec15 100644 (file)
--- a/modules/nagios/templates/inc-debian.org.erb
+++ b/modules/nagios/templates/inc-debian.org.erb
@@ -26,3 +26,4 @@ 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]=/usr/lib/nagios/plugins/dsa-eventhandler-restart-service $SERVICESTATE$ $SERVICESTATETYPE$ $SERVICEATTEMPT$ ekeyd-egd-linux

diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers
index 871136d0a35a7820a49ee23c6d51532abbc91414..6ab2f9b2b6a7db01da0bf28a933312ad7b015f61 100644 (file)
--- a/modules/sudo/files/common/sudoers
+++ b/modules/sudo/files/common/sudoers
@@ -44,6 +44,7 @@ admin         agnesi=(ALL)    ALL
 %zivit-admins  ZIVITHOSTS=(ALL)        NOPASSWD: ALL
 
 # nagios
+nagios         ALL=(ALL)       NOPASSWD: /etc/init.d/ekeyd-egd-linux restart
 nagios         ALL=(ALL)       NOPASSWD: /usr/lib/nagios/plugins/dsa-check-dabackup ""
 # with smartarray controllers
 nagios         ALL=(ALL)       NOPASSWD: /sbin/hpasmcli ""