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

diff --git a/modules/nagios/templates/inc-debian.org.erb b/modules/nagios/templates/inc-debian.org.erb
index 70f37b0bc..5732e2a31 100644
--- a/modules/nagios/templates/inc-debian.org.erb
+++ b/modules/nagios/templates/inc-debian.org.erb
@@ -4,15 +4,13 @@
 ##
 
 <%=
-ournag = []
+nagii = []
 localinfo.keys.sort.each do |node|
-  if localinfo[node]['nagiosmaster'] == "true"
-    ournag << keyinfo[node][0]['ipHostNumber']
+  if localinfo[node]['nagiosmaster'] or localinfo[node]['extranrpeclient']
+    nagii << allnodeinfo[node]['ipHostNumber']
   end
 end
 
-nagii = ournag
-
 case fqdn when
   'mundy.debian.org', 'penalosa.debian.org', 'caballero.debian.org', 'peri.debian.org' then
     nagii << '192.34.35.49'
@@ -28,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