X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fdefs.conf.erb;h=35fb7a1abb20fbdb88031082c5a6fa35f58e342f;hb=3ecf7721c32e4e34ee964ec57ac581ae44aca8ba;hp=101e0119befe673cfee7d517127d79eeddb9a0da;hpb=7f4fae080cd03a18dbb7998161f0893626cbad85;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index 101e0119b..35fb7a1ab 100644
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -8,7 +8,7 @@
 }
 
 @def &SERVICE_RANGE($proto, $port, $srange) = {
- proto $proto mod state state (NEW) dport $port @subchain '$port' { saddr ($srange) ACCEPT; }"
+ proto $proto mod state state (NEW) dport $port @subchain "$port" { saddr ($srange) ACCEPT; }"
 }
 
 @def &TCP_UDP_SERVICE($port) = {
@@ -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
@@ -178,6 +178,7 @@
 @def $DSA_IPS = ($sgran $weasel $zobel $luca);
 
 @def $sgran6     = (2001:4b10:100b::/48);
+@def $sgran6     = ($sgran6 2001:4b10:0000:810b::/64);
 @def $weasel6    = ();
 @def $weasel6    = ($weasel6 2001:826:408:200::/56); # came
 @def $weasel6    = ($weasel6 2001:858:10f::/48); # anguilla