X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fdefs.conf.erb;h=226ae70e716fda6fd53829e4720256551cf90f4b;hb=15ecebbe0b061712fd004465847605c51da898d6;hp=15810e85df4b7fe40b6f5c1f30b7aa5315c3122a;hpb=94a1ed63ad00ffb022307d4d91408e6cc3c0406a;p=dsa-puppet.git

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index 15810e85..226ae70e 100644
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -12,11 +12,11 @@
 }
 
 @def &TCP_UDP_SERVICE($port) = {
- proto (tcp udp) mod state state (NEW) dport $port ACCEPT;
+ proto (tcp udp) dport $port ACCEPT;
 }
 
 @def &TCP_UDP_SERVICE_RANGE($port, $srange) = {
- proto (tcp udp) mod state state (NEW) dport $port @subchain "$port" { saddr ($srange) ACCEPT; }"
+ proto (tcp udp) dport $port @subchain "$port" { saddr ($srange) ACCEPT; }"
 }
 
 @def $HOST_MAILRELAY_V4 = (<%=
@@ -165,10 +165,6 @@
   dbs.join(' ')
 %>);
 
-# FIXME XXX we should get these from other information, and reconsider the places where we use them in destination matching rules
-@def $HOST_GANETI_V4           = (206.12.19.213/32 206.12.19.217/32 206.12.19.212/32 206.12.19.216/32);
-@def $HOST_GANETI_BACKEND_V4   = (192.168.2.213/32 192.168.2.217/32 192.168.2.212/32 192.168.2.216/32);
-
 @def $HOST_DEBIAN = ($HOST_DEBIAN_V4 $HOST_DEBIAN_V6);
 
 @def $sgran   = (91.103.132.24/29 85.158.45.51/32);
@@ -193,7 +189,8 @@
 @def $tfheen   = ($tfheen 194.31.39.0/26); # office network
 @def $tfheen   = ($tfheen 195.159.200.122); # home
 @def $tfheen   = ($tfheen 77.40.254.120/29); # home
-@def $DSA_IPS = ($sgran $weasel $zobel $luca $paravoid $tfheen);
+@def $master   = (82.195.75.110); # master.debian.org
+@def $DSA_IPS = ($sgran $weasel $zobel $luca $paravoid $tfheen $master);
 
 @def $sgran6     = (2001:4b10:100b::/48);
 @def $sgran6     = ($sgran6 2001:4b10:0000:810b::/64);
@@ -212,18 +209,31 @@
 @def $tfheen6    = ($tfheen6 2a02:c0:1013:1::/64); # Office
 @def $tfheen6    = ($tfheen6 2001:840:f000:4007::/64); # Home, link
 @def $tfheen6    = ($tfheen6 2001:840:4007::/48); # Home
-@def $DSA_V6_IPS = ($sgran6 $weasel6 $zobel6 $luca6 $paravoid6 $tfheen6);
+@def $master6     = (2001:41b8:202:deb:216:36ff:fe40:4001); # master.debian.org
+@def $DSA_V6_IPS = ($sgran6 $weasel6 $zobel6 $luca6 $paravoid6 $tfheen6 $master6);
 
 @def $USER_christoph = ();
 @def $USER_christoph = ($USER_christoph 212.114.250.148/31);
+@def $USER_christoph = ($USER_christoph 128.111.48.6/32); # U of Cal at Santa Barbara, until 2013-03
 @def $USER_aurel32 = ();
 @def $USER_aurel32 = ($USER_aurel32 88.191.126.93); # hall.aurel32.net
 @def $USER_aurel32 = ($USER_aurel32 82.232.2.251); # farad.aurel32.net
+@def $USER_joerg   = ();
+@def $USER_joerg   = ($USER_joerg 213.146.108.160/29);
+@def $USER_joerg   = ($USER_joerg 46.4.205.32);
+@def $USER_joerg6  = ();
+@def $USER_joerg6  = ($USER_joerg6 2a02:248:1005::/48);
+@def $USER_joerg6  = ($USER_joerg6 2a01:4f8:131:1520::6667);
 
 @def $BUILDD_SSH_ACCESS = ();
 @def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 194.177.211.200); # grieg
-@def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 70.103.162.29); # master
+@def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 97.107.116.29); # master
 @def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 206.12.19.5); # ravel
+@def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 82.195.75.110); # new-master
 @def $FREEBSD_SSH_ACCESS = ();
 @def $FREEBSD_SSH_ACCESS = ($FREEBSD_SSH_ACCESS $DSA_IPS $BUILDD_SSH_ACCESS);
 @def $FREEBSD_SSH_ACCESS = ($FREEBSD_SSH_ACCESS $USER_christoph $USER_aurel32); # buildd admins
+@def $UNGER_SSH_ACCESS = ();
+@def $UNGER_SSH_ACCESS = ($UNGER_SSH_ACCESS $USER_joerg);
+@def $UNGER_SSH6_ACCESS = ();
+@def $UNGER_SSH6_ACCESS = ($UNGER_SSH6_ACCESS $USER_joerg6);