X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Ftemplates%2Finc-debian.org.erb;h=1da5548ff648101c384c1ac8de799f78108cb176;hb=802e8b8fc8aa875bb8d1d1cfff8878255cde6e21;hp=bbbe456cdaddc49d893529107f2b55cc8051ed6b;hpb=a92c6b00d39a8866a6caf479b690e5d673c83609;p=mirror%2Fdsa-puppet.git

diff --git a/modules/nagios/templates/inc-debian.org.erb b/modules/nagios/templates/inc-debian.org.erb
index bbbe456cd..1da5548ff 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']
-    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'