X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Ftemplates%2Finc-debian.org.erb;h=d641b827be383bc4c40652e0adef9e230983f0a1;hb=c46ff2155be94c3e1c3226879e13a8f31dbbac1b;hp=817366e7186216c70ef37d9cefda7c2186a37568;hpb=971573de556cd68ce1ada54f7a07c366c69ed953;p=mirror%2Fdsa-puppet.git

diff --git a/modules/nagios/templates/inc-debian.org.erb b/modules/nagios/templates/inc-debian.org.erb
index 817366e71..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 = []
-roles = scope.lookupvar('site::roles')
-roles['nagiosmaster'].each do |nag|
-	nagii << scope.lookupvar('site::allnodeinfo')[nag]['ipHostNumber']
-end
-roles['extranrpeclient'].each do |nag|
-	nagii << scope.lookupvar('site::allnodeinfo')[nag]['ipHostNumber']
-end
-
-out = "allowed_hosts=" + nagii.flatten.sort.uniq.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 || /usr/lib/nagios/plugins/check_procs -w 1: -u root -a /lib/systemd/systemd-shutdownd > /dev/null || ( busctl get-property org.freedesktop.login1 /org/freedesktop/login1 org.freedesktop.login1.Manager ScheduledShutdown 2> /dev/null | awk '$3 > 0 { t=$3; } END { exit (t == 0)}' ); 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