X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Ftemplates%2Finc-debian.org.erb;h=b8a26d696693bd3746e96d14fc9e3073e6ec3ebf;hb=5ab8afac983748451b8a2e781b65c4b9d72220a0;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..b8a26d696 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 << keyinfo[node][0]['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'