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

diff --git a/modules/nagios/templates/inc-debian.org.erb b/modules/nagios/templates/inc-debian.org.erb
index 3391745f9..5732e2a31 100644
--- a/modules/nagios/templates/inc-debian.org.erb
+++ b/modules/nagios/templates/inc-debian.org.erb
@@ -4,7 +4,12 @@
 ##
 
 <%=
-nagii = [ '192.25.206.33', '82.195.75.106' ]
+nagii = []
+localinfo.keys.sort.each do |node|
+  if localinfo[node]['nagiosmaster'] or localinfo[node]['extranrpeclient']
+    nagii << allnodeinfo[node]['ipHostNumber']
+  end
+end
 
 case fqdn when
   'mundy.debian.org', 'penalosa.debian.org', 'caballero.debian.org', 'peri.debian.org' then
@@ -21,3 +26,4 @@ out
 # 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