X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=d60ff069b822efd0b91ba36c51d4138360a0ecee;hb=90d74b627d41a7d9118a62b6aeb3cf55984aca9a;hp=f2f13a3b420c2cf759f954b253f8005568205560;hpb=e733600e917f78330b957715d1a2cf6d06c18963;p=mirror%2Fdsa-puppet.git diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb index f2f13a3b4..d60ff069b 100644 --- a/modules/ferm/templates/me.conf.erb +++ b/modules/ferm/templates/me.conf.erb @@ -17,11 +17,8 @@ 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{beethoven}.include?(hostname) then ssh4allowed << '$HOST_DEBIAN_V4'