From: Stephen Gran Date: Sat, 14 May 2011 14:16:39 +0000 (+0100) Subject: Add event_handler hooks to sudo and nrpe. X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=4d24877d97fbc89df792b28f60d22463f25a2bae;p=mirror%2Fdsa-puppet.git 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 --- diff --git a/modules/nagios/templates/inc-debian.org.erb b/modules/nagios/templates/inc-debian.org.erb index 1da5548ff..9a4ca4286 100644 --- 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 871136d0a..6ab2f9b2b 100644 --- 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 ""