X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Ftemplates%2Finc-debian.org.erb;h=0ee8d170abefbd5533d8c68c9282bff3cd0c61e5;hb=4b0d5b04319abfcdd5ef3a80b31f7728900f358e;hp=3c5819f789fbece5212ee71358e1b7b4889ee558;hpb=103e56b48752f77fd66edd1824d82946570ca033;p=mirror%2Fdsa-puppet.git

diff --git a/modules/nagios/templates/inc-debian.org.erb b/modules/nagios/templates/inc-debian.org.erb
index 3c5819f78..0ee8d170a 100644
--- a/modules/nagios/templates/inc-debian.org.erb
+++ b/modules/nagios/templates/inc-debian.org.erb
@@ -5,18 +5,15 @@
 
 <%=
 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
+roles = scope.lookupvar('site::roles')
+roles['nagiosmaster'].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'
+roles['extranrpeclient'].each do |nag|
+	nagii << scope.lookupvar('site::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/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[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