}
@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 = (<%=
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);
@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);