X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fdefs.conf.erb;h=a68420977033a766f66edceb590074bd2ce03c91;hb=d7475f90c56697e9589e1386ced135498df68c81;hp=31f1bb464027d8f67b3de0eb48686c465e3f1c23;hpb=61b06c897b8b1414469f56eea0644477a5dd2c26;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index 31f1bb464..a68420977 100644
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -8,18 +8,48 @@
 }
 
 @def &SERVICE_RANGE($proto, $port, $srange) = {
- proto $proto mod state state (NEW) dport $port saddr ($srange) ACCEPT;
+ proto $proto mod state state (NEW) dport $port @subchain "$port" { saddr ($srange) ACCEPT; }"
 }
 
 @def &TCP_UDP_SERVICE($port) = {
  proto (tcp udp) mod state state (NEW) dport $port ACCEPT;
 }
 
+@def $HOST_MAILRELAY_V4 = (<%=
+  mailrelay = []
+  localinfo.keys.sort.each do |node|
+      if localinfo[node]['mailrelay']
+          ldapall[node]['ipHostNumber'].each do |ip|
+             next if ip =~ /:/
+             mailrelay << ip
+          end
+      end
+  end
+
+  mailrelay.join(' ')
+%>);
+
+@def $HOST_MAILRELAY_V6 = (<%=
+  mailrelay = []
+  localinfo.keys.sort.each do |node|
+      if localinfo[node]['mailrelay']
+          ldapall[node]['ipHostNumber'].each do |ip|
+             next if ip =~ /\./
+             mailrelay << ip
+          end
+      end
+  end
+
+  mailrelay.join(' ')
+%>);
+
+@def $HOST_MAILRELAY = ( $HOST_MAILRELAY_V4 $HOST_MAILRELAY_V6 );
+
 @def $HOST_NAGIOS_V4 = (<%=
   nagii = []
   localinfo.keys.sort.each do |node|
-      if localinfo[node]['nagiosmaster']
-          keyinfo[node][0]['ipHostNumber'].each do |ip|
+      if localinfo[node]['nagiosmaster'] or localinfo[node]['extranrpeclient']
+          ldapall[node]['ipHostNumber'].each do |ip|
              next if ip =~ /:/
              nagii << ip
           end
@@ -32,8 +62,8 @@
 @def $HOST_NAGIOS_V6 = (<%=
   nagii = []
   localinfo.keys.sort.each do |node|
-      if localinfo[node]['nagiosmaster']
-          keyinfo[node][0]['ipHostNumber'].each do |ip|
+      if localinfo[node]['nagiosmaster'] or localinfo[node]['extranrpeclient']
+          ldapall[node]['ipHostNumber'].each do |ip|
              next if ip =~ /\./
              nagii << ip
           end
@@ -49,7 +79,7 @@
   munins = []
   localinfo.keys.sort.each do |node|
       if localinfo[node]['muninmaster']
-          keyinfo[node][0]['ipHostNumber'].each do |ip|
+          ldapall[node]['ipHostNumber'].each do |ip|
              next if ip =~ /:/
              munins << ip
           end
@@ -63,7 +93,7 @@
   munins = []
   localinfo.keys.sort.each do |node|
       if localinfo[node]['muninmaster']
-          keyinfo[node][0]['ipHostNumber'].each do |ip|
+          ldapall[node]['ipHostNumber'].each do |ip|
              next if ip =~ /\./
              munins << ip
           end
@@ -79,7 +109,7 @@
   dbs = []
   localinfo.keys.sort.each do |node|
       if localinfo[node]['dbmaster']
-          keyinfo[node][0]['ipHostNumber'].each do |ip|
+          ldapall[node]['ipHostNumber'].each do |ip|
              next if ip =~ /\./
              dbs << ip
           end
@@ -93,7 +123,7 @@
   dbs = []
   localinfo.keys.sort.each do |node|
       if localinfo[node]['dbmaster']
-          keyinfo[node][0]['ipHostNumber'].each do |ip|
+          ldapall[node]['ipHostNumber'].each do |ip|
              next if ip =~ /:/
              dbs << ip
           end
@@ -107,9 +137,9 @@
 
 @def $HOST_DEBIAN_V4 = (<%=
   dbs = []
-  keyinfo.keys.sort.each do |node|
-      next unless keyinfo[node][0].has_key?('ipHostNumber')
-      keyinfo[node][0]['ipHostNumber'].each do |ip|
+  ldapall.keys.sort.each do |node|
+      next unless ldapall[node].has_key?('ipHostNumber')
+      ldapall[node]['ipHostNumber'].each do |ip|
          next if ip =~ /:/
          dbs << ip
       end
@@ -120,9 +150,9 @@
 
 @def $HOST_DEBIAN_V6  = (<%=
   dbs = []
-  keyinfo.keys.sort.each do |node|
-      next unless keyinfo[node][0].has_key?('ipHostNumber')
-      keyinfo[node][0]['ipHostNumber'].each do |ip|
+  ldapall.keys.sort.each do |node|
+      next unless ldapall[node].has_key?('ipHostNumber')
+      ldapall[node]['ipHostNumber'].each do |ip|
          next if ip =~ /\./
          dbs << ip
       end
@@ -133,7 +163,7 @@
 
 @def $HOST_DEBIAN = ($HOST_DEBIAN_V4 $HOST_DEBIAN_V6);
 
-@def $sgran   = (91.103.132.24/29);
+@def $sgran   = (91.103.132.24/29 85.158.45.51/32);
 @def $weasel  = ();
 @def $weasel  = ($weasel 86.59.118.144/28); # debian@sil
 @def $weasel  = ($weasel 86.59.21.32/29); # anguilla1
@@ -148,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
@@ -157,3 +188,12 @@
 @def $zobel6     = ($zobel6 2a01:198:549::/48); # WGS20
 @def $luca6      = ();
 @def $DSA_V6_IPS = ($sgran6 $weasel6 $zobel6 $luca6);
+
+@def $USER_kibi = ();
+@def $USER_kibi = ($USER_kibi 90.80.97.98); # gruyere.kerlabs.com
+@def $USER_kibi = ($USER_kibi 88.164.242.219); # home.ikibiki.org
+@def $USER_kibi = ($USER_kibi 82.244.158.68); # @parents'
+@def $USER_aurel32 = ();
+@def $USER_aurel32 = ($USER_aurel32 88.191.82.174); # hall.aurel32.net
+@def $USER_aurel32 = ($USER_aurel32 82.232.2.251); # farad.aurel32.net
+@def $FREEBSD_SSH_ACCESS = ($DSA_IPS $USER_kibi $USER_aurel32);