X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=0ff422b3772640ad94d0738719def20499574346;hb=d7a499c723f35e45dd5b0eace19ea936f5b3c767;hp=331ef52aab048a348963b3248b6a533b10d24f91;hpb=9beaf0ec40f9e6496afe34c4391b7913ecee33ee;p=mirror%2Fdsa-puppet.git diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb index 331ef52aa..0ff422b37 100644 --- a/modules/ferm/templates/me.conf.erb +++ b/modules/ferm/templates/me.conf.erb @@ -6,7 +6,7 @@ <%= out = [] -restrict_ssh = %w{logtest01 geo1 geo2 geo3 bartok beethoven tchaikovsky schroeder heininen handel} +restrict_ssh = %w{lebrun logtest01 geo1 geo2 geo3 bartok beethoven tchaikovsky schroeder heininen handel} ssh4allowed = [] ssh6allowed = [] @@ -15,9 +15,11 @@ if restrict_ssh.include?(hostname) then ssh4allowed << %w{$DSA_IPS $HOST_NAGIOS_V4 $HOST_DB_V4} ssh6allowed << %w{$DSA_V6_IPS $HOST_NAGIOS_V6 $HOST_DB_V6} end -if %w{schroeder}.include?(hostname) then +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 << '82.195.75.84' # nott.ayous.org, HE (builddadm) end if %w{bartok beethoven}.include?(hostname) then