X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fferm%2Ftemplates%2Fdefs.conf.erb;h=0805b2f9dcb5a2972201fd1b4210cb84fea6e586;hb=a4a443fed7bb0fb33dc32222dbcac12c4257837e;hp=bb0a4f62eea8c36a7cd4f9894f3a9e08da68a88a;hpb=05f75b180353ace7dbc4f39111a1151cc959f806;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index bb0a4f62e..0805b2f9d 100644
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -168,7 +168,6 @@
 @def $HOST_DEBIAN = ($HOST_DEBIAN_V4 $HOST_DEBIAN_V6);
 
 @def $sgran   = (91.103.132.24/29 85.158.45.51/32);
-@def $sgran   = ($sgran 94.195.192.0/19); # Temporarily on O2 ADSL
 @def $weasel  = ();
 @def $weasel  = ($weasel 86.59.118.144/28); # debian@sil
 @def $weasel  = ($weasel 86.59.21.32/29); # anguilla1
@@ -203,3 +202,5 @@
 @def $FREEBSD_SSH_ACCESS = ();
 @def $FREEBSD_SSH_ACCESS = ($FREEBSD_SSH_ACCESS $DSA_IPS $USER_christoph $USER_aurel32);
 @def $FREEBSD_SSH_ACCESS = ($FREEBSD_SSH_ACCESS 194.177.211.200); # grieg
+@def $FREEBSD_SSH_ACCESS = ($FREEBSD_SSH_ACCESS 70.103.162.29); # master
+@def $FREEBSD_SSH_ACCESS = ($FREEBSD_SSH_ACCESS 206.12.19.5); # ravel