dbs.join(' ')
%>);
-@def $HOST_GANETI_V4 = (206.12.19.213/32 206.12.19.217/32);
-
@def $HOST_DEBIAN = ($HOST_DEBIAN_V4 $HOST_DEBIAN_V6);
@def $sgran = (91.103.132.24/29 85.158.45.51/32);
@def $zobel = ($zobel 195.49.152.0/22); # DG-i AS
@def $zobel = ($zobel 194.187.64.0/22); # DG-i AS
@def $luca = (64.71.152.109);
-@def $paravoid = (83.212.9.72); # faidon.noc.grnet.gr
+@def $paravoid = (62.217.125.135); # scrooge.tty.gr
@def $tfheen = ();
@def $tfheen = ($tfheen 194.31.39.0/26); # office network
@def $tfheen = ($tfheen 195.159.200.122); # home
@def $zobel6 = ($zobel6 2a01:198:6b2::/48); # AdS20
@def $zobel6 = ($zobel6 2a02:158::/32); # DG-i AS
@def $luca6 = ();
-@def $paravoid6 = (2001:648:2340:1:225:64ff:fea4:8590); # faidon.noc.grnet.gr
+@def $paravoid6 = (2001:648:2ffc:113:dcdb:eeff:fe5c:182b); # scrooge.tty.gr
@def $tfheen6 = ();
@def $tfheen6 = ($tfheen6 2a02:c0:1013:1::/64); # Office
@def $tfheen6 = ($tfheen6 2001:840:f000:4007::/64); # Home, link
@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 $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);