X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fdefs.conf.erb;h=431b99701eafac77062929406e9160c32be78a2e;hb=08832b82184b83b2ad9c3fdc0d03147ba5a08eef;hp=4401fbe01096c43e99ca33461cbef6c82638d5a9;hpb=430f438a0312c6d9a3f85470effce83d168ea7ed;p=dsa-puppet.git

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index 4401fbe0..431b9970 100644
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -101,7 +101,7 @@
 @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);
 
@@ -128,9 +128,6 @@
 @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);
@@ -144,4 +141,4 @@
 @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