remove kibi, add christoph for freebsd whitelist

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index b79a1e8245c270cc32edc441b9f436d988513dd6..78a200fd21a9a693d93e2a57971102b7260af138 100644 (file)
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -194,13 +194,11 @@
 @def $luca6      = ();
 @def $DSA_V6_IPS = ($sgran6 $weasel6 $zobel6 $luca6);
 
-@def $USER_kibi = ();
-@def $USER_kibi = ($USER_kibi 90.80.97.98); # gruyere.kerlabs.com
-@def $USER_kibi = ($USER_kibi 88.164.242.219); # home.ikibiki.org
-@def $USER_kibi = ($USER_kibi 82.244.158.68); # @parents'
+@def $USER_christoph = ();
+@def $USER_christoph = ($USER_christoph 212.114.250.148/31);
 @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 $FREEBSD_SSH_ACCESS = ();
-@def $FREEBSD_SSH_ACCESS = ($FREEBSD_SSH_ACCESS $DSA_IPS $USER_kibi $USER_aurel32);
+@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