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

diff --git a/modules/nagios/templates/inc-debian.org.erb b/modules/nagios/templates/inc-debian.org.erb
index 5732e2a31..8a0babb50 100644
--- a/modules/nagios/templates/inc-debian.org.erb
+++ b/modules/nagios/templates/inc-debian.org.erb
@@ -5,18 +5,15 @@
 
 <%=
 nagii = []
-localinfo.keys.sort.each do |node|
-  if localinfo[node]['nagiosmaster'] or localinfo[node]['extranrpeclient']
-    nagii << allnodeinfo[node]['ipHostNumber']
-  end
+roles = scope.lookupvar('deprecated::roles')
+roles['nagiosmaster'].each do |nag|
+	nagii << scope.lookupvar('deprecated::allnodeinfo')[nag]['ipHostNumber']
 end
-
-case fqdn when
-  'mundy.debian.org', 'penalosa.debian.org', 'caballero.debian.org', 'peri.debian.org' then
-    nagii << '192.34.35.49'
+roles['extranrpeclient'].each do |nag|
+	nagii << scope.lookupvar('deprecated::allnodeinfo')[nag]['ipHostNumber']
 end
 
-out = "allowed_hosts=" + nagii.join(',')
+out = "allowed_hosts=" + nagii.flatten.sort.uniq.join(',')
 out
 %>
 
@@ -25,5 +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; 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 /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