X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Ftemplates%2Finc-debian.org.erb;h=a7bc2d7eb28d1884e286784c9843e0dda19a64f9;hb=9728596ba8cf819fe5255eb2aee9b2c469b8359c;hp=b06c3284d48a119304caf1bbef42ea3e86a4255f;hpb=3eb533e5499e66423bafdedaf6c7d08ead1772de;p=mirror%2Fdsa-puppet.git

diff --git a/modules/nagios/templates/inc-debian.org.erb b/modules/nagios/templates/inc-debian.org.erb
index b06c3284d..a7bc2d7eb 100644
--- a/modules/nagios/templates/inc-debian.org.erb
+++ b/modules/nagios/templates/inc-debian.org.erb
@@ -1,29 +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 = []
-scope.lookupvar('site::localinfo').keys.sort.each do |node|
-  if scope.lookupvar('site::localinfo')[node]['nagiosmaster'] or scope.lookupvar('site::localinfo')[node]['extranrpeclient']
-    nagii << scope.lookupvar('site::allnodeinfo')[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[restart-ekey]=sudo /etc/init.d/ekeyd-egd-linux restart
+command[dsa2_shutdown]=if [ -e /run/systemd/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