X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Ftemplates%2Finc-debian.org.erb;h=8a0babb50dcf003835f896cef58c85e75c2076a8;hb=07307bc8fa2416ce3b972d891b6fa53d93992a87;hp=dd6622b3a176a6bb0192f17a71cfc76ee08d9d3c;hpb=100a1ee83dda857ae910cba5b1be5a4209f18e57;p=mirror%2Fdsa-puppet.git

diff --git a/modules/nagios/templates/inc-debian.org.erb b/modules/nagios/templates/inc-debian.org.erb
index dd6622b3a..8a0babb50 100644
--- a/modules/nagios/templates/inc-debian.org.erb
+++ b/modules/nagios/templates/inc-debian.org.erb
@@ -5,17 +5,12 @@
 
 <%=
 nagii = []
-roles = scope.lookupvar('site::roles')
+roles = scope.lookupvar('deprecated::roles')
 roles['nagiosmaster'].each do |nag|
-	nagii << scope.lookupvar('site::allnodeinfo')[nag]['ipHostNumber']
+	nagii << scope.lookupvar('deprecated::allnodeinfo')[nag]['ipHostNumber']
 end
 roles['extranrpeclient'].each do |nag|
-	nagii << scope.lookupvar('site::allnodeinfo')[nag]['ipHostNumber']
-end
-
-case fqdn when
-  'mundy.debian.org', 'caballero.debian.org' then
-    nagii << '192.34.35.49'
+	nagii << scope.lookupvar('deprecated::allnodeinfo')[nag]['ipHostNumber']
 end
 
 out = "allowed_hosts=" + nagii.flatten.sort.uniq.join(',')
@@ -27,7 +22,7 @@ out
 # 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; 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