X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=19a1f82944fc610bb080eeb89de4da6c90b29e9e;hb=8523b352f2b2e9a9fb29573d8f20f4202fe7a865;hp=bae42b7f408c42b83c70a0ce3235e5ba3866d33e;hpb=4cde20790e8a1c35eb50ca51a273fdd2975f2072;p=mirror%2Fdsa-puppet.git diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb index bae42b7f4..19a1f8294 100644 --- a/modules/ferm/templates/me.conf.erb +++ b/modules/ferm/templates/me.conf.erb @@ -18,13 +18,14 @@ end if %w{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 );' ssh4allowed << '$CARNET' + ssh4allowed << '82.195.75.84' # nott.ayous.org, HE (builddadm) end if %w{bartok beethoven}.include?(hostname) then ssh4allowed << '$HOST_DEBIAN_V4' ssh6allowed << '$HOST_DEBIAN_V6' end ssh4allowed.length == 0 and ssh4allowed << '0.0.0.0/0' -ssh6allowed.length == 0 and ssh6allowed << '::' +ssh6allowed.length == 0 and ssh6allowed << '::/0' out << "@def $SSH_SOURCES = (#{ssh4allowed.join(' ')});" out << "@def $SSH_V6_SOURCES = (#{ssh6allowed.join(' ')});"