From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 30 Apr 2011 17:16:53 +0000 (+0200)
Subject: remove kibi from carnet ssh whitelist
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c3f3b0635d6e2b11512e5383e4a681722eda8fa8;p=dsa-puppet.git

remove kibi from carnet ssh whitelist
---

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index f2f13a3b..1637b3b8 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -17,9 +17,7 @@ if restrict_ssh.include?(hostname) then
 end
 if %w{lebrun schroeder}.include?(hostname) then
 	out << '@def $CARNET = ( 193.198.184.8/29 161.53.160.133 161.53.160.90 161.53.11.222 161.53.12.134 161.53.12.142 161.53.12.143 );'
-	out << '@def $KIBI = ( 88.164.242.219 );'
 	ssh4allowed << '$CARNET'
-	ssh4allowed << '$KIBI'
 	ssh4allowed << '70.103.162.29' # master
 	ssh4allowed << '82.195.75.84'  # nott.ayous.org, HE (builddadm)
 end