@def $zobel = ($zobel 93.94.128.0/21); # DG-i AS
@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 $luca = ();
+@def $luca = ($luca 69.4.89.5); # fubar.emyr.net
+@def $luca = ($luca 137.82.37.25); # eye.iun.ubc.ca
@def $paravoid = (62.217.125.135); # scrooge.tty.gr
@def $tfheen = ();
@def $tfheen = ($tfheen 195.159.200.122); # home
@def $tfheen = ($tfheen 77.40.254.120/29); # home
@def $jcristau = ();
@def $jcristau = ($jcristau 82.225.74.107/32); # home
-@def $jcristau = ($jcristau 109.190.188.123/32 109.190.188.138/32); # office
+@def $jcristau = ($jcristau 109.190.188.123/32 109.190.188.138/32 109.190.107.82/32); # office
@def $master = (82.195.75.110); # master.debian.org
@def $DSA_IPS = ($sgran $weasel $zobel $luca $paravoid $tfheen $jcristau $master);
@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 $BUILDD_SSH_ACCESS = ();
@def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 5.153.231.18); # wuiet
@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 $FREEBSD_SSH_ACCESS = ($FREEBSD_SSH_ACCESS $USER_christoph); # buildd admins