X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Ftemplates%2Finc-debian.org.erb;h=d641b827be383bc4c40652e0adef9e230983f0a1;hb=978b3d3a80635c75775d7ae42485a8e14478eda3;hp=b3ce35859e87c871f6f3c5d247aee72d03181a13;hpb=d7475f90c56697e9589e1386ced135498df68c81;p=mirror%2Fdsa-puppet.git diff --git a/modules/nagios/templates/inc-debian.org.erb b/modules/nagios/templates/inc-debian.org.erb index b3ce35859..d641b827b 100644 --- a/modules/nagios/templates/inc-debian.org.erb +++ b/modules/nagios/templates/inc-debian.org.erb @@ -1,28 +1,8 @@ -## -## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE. -## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git -## - -<%= -nagii = [] -localinfo.keys.sort.each do |node| - if localinfo[node]['nagiosmaster'] or localinfo[node]['extranrpeclient'] - nagii << ldapall[node]['ipHostNumber'] - end -end - -case fqdn when - 'mundy.debian.org', 'penalosa.debian.org', 'caballero.debian.org', 'peri.debian.org' then - nagii << '192.34.35.49' -end - -out = "allowed_hosts=" + nagii.join(',') -out -%> - - # the string "system-in-shutdown" is used by the remote side to tell # if a system is running shutdown. We do not use check_nrpe's # 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[dsa2_shutdown]=if /usr/local/bin/dsa-is-shutdown-scheduled; then echo 'system-in-shutdown'; else echo 'no shutdown running' ; fi +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