X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fdefs.conf.erb;h=1ded234dc00aba0145a756f3e83b312187e67924;hb=7c041353f4da829d409830eba2e95946952e817f;hp=8c700d87da95c2c0bc85e56ad499cb41fe153ace;hpb=940d9a08a643646a9d7e383d9307619fce2f7b40;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index 8c700d87d..1ded234dc 100644
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -167,9 +167,6 @@ end
 @def $master6    = (2001:41b8:202:deb:216:36ff:fe40:4001); # master.debian.org
 @def $DSA_V6_IPS = ($weasel6 $zobel6 $luca6 $tfheen6 $jcristau6 $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_joerg   = ();
 @def $USER_joerg   = ($USER_joerg 213.146.108.160/29);
 @def $USER_joerg   = ($USER_joerg 46.4.205.32);
@@ -181,6 +178,3 @@ end
 @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 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); # buildd admins