X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fdefs.conf.erb;h=35fb7a1abb20fbdb88031082c5a6fa35f58e342f;hb=3ecf7721c32e4e34ee964ec57ac581ae44aca8ba;hp=cd898100aaee9bb5e25734d3c61e0b4369160a50;hpb=d43b7564f951127288f4a0a7cd8034df10242bbb;p=mirror%2Fdsa-puppet.git diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb index cd898100a..35fb7a1ab 100644 --- a/modules/ferm/templates/defs.conf.erb +++ b/modules/ferm/templates/defs.conf.erb @@ -48,7 +48,7 @@ @def $HOST_NAGIOS_V4 = (<%= nagii = [] localinfo.keys.sort.each do |node| - if localinfo[node]['nagiosmaster'] + if localinfo[node]['nagiosmaster'] or localinfo[node]['extranrpeclient'] keyinfo[node][0]['ipHostNumber'].each do |ip| next if ip =~ /:/ nagii << ip @@ -62,7 +62,7 @@ @def $HOST_NAGIOS_V6 = (<%= nagii = [] localinfo.keys.sort.each do |node| - if localinfo[node]['nagiosmaster'] + if localinfo[node]['nagiosmaster'] or localinfo[node]['extranrpeclient'] keyinfo[node][0]['ipHostNumber'].each do |ip| next if ip =~ /\./ nagii << ip