X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fdefs.conf.erb;h=9816e8998ac70ea8153f7dfeca3518c3afcca292;hb=03085268d8108cc493da21c2bf5d8a474c98384d;hp=6093e2d7629e4c7f10ba872257f6302161e706e2;hpb=2bb51a5d76d106f4ea097f5a075e24a848de5bd5;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index 6093e2d76..9816e8998 100644
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -165,9 +165,6 @@
   dbs.join(' ')
 %>);
 
-@def $HOST_GANETI_V4           = (206.12.19.213/32 206.12.19.217/32);
-@def $HOST_GANETI_BACKEND_V4   = (192.168.2.213/32 192.168.2.217/32);
-
 @def $HOST_DEBIAN = ($HOST_DEBIAN_V4 $HOST_DEBIAN_V6);
 
 @def $sgran   = (91.103.132.24/29 85.158.45.51/32);
@@ -215,6 +212,7 @@
 
 @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