better??

[dsa-puppet.git] / modules / ferm / templates / me.conf.erb

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index b88d974ae9f8bc17bdf47b934dda80cd0f81d507..d60ff069b822efd0b91ba36c51d4138360a0ecee 100644 (file)
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -6,7 +6,7 @@
 <%=
 out = []
 
-restrict_ssh = %w{lebrun logtest01 geo1 geo2 geo3 bartok beethoven tchaikovsky schroeder heininen handel lotti}
+restrict_ssh = %w{lebrun logtest01 geo1 geo2 geo3 beethoven tchaikovsky schroeder heininen handel lotti}
 
 ssh4allowed = []
 ssh6allowed = []
@@ -17,13 +17,10 @@ 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)
+       ssh4allowed << '$BUILDD_SSH_ACCESS'
 end
-if %w{bartok beethoven}.include?(hostname) then
+if %w{beethoven}.include?(hostname) then
        ssh4allowed << '$HOST_DEBIAN_V4'
        ssh6allowed << '$HOST_DEBIAN_V6'
 end