X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=b88d974ae9f8bc17bdf47b934dda80cd0f81d507;hb=3bdf75cf1c1518cbc30cba6298cbe2bc6edaa329;hp=f1f9ad15e782de578000e793663dc4c3df3388ee;hpb=6d43335dee4250b017a9c850b0746c44bba60c7c;p=dsa-puppet.git diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb index f1f9ad15..b88d974a 100644 --- 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} +restrict_ssh = %w{lebrun logtest01 geo1 geo2 geo3 bartok beethoven tchaikovsky schroeder heininen handel lotti} ssh4allowed = [] ssh6allowed = [] @@ -49,7 +49,7 @@ if not nodeinfo['smarthost'].empty? end smtp4allowed.length == 0 and smtp4allowed << '0.0.0.0/0' -smtp6allowed.length == 0 and smtp6allowed << '::' +smtp6allowed.length == 0 and smtp6allowed << '::/0' out << "@def $SMTP_SOURCES = (#{smtp4allowed.join(' ')});" out << "@def $SMTP_V6_SOURCES = (#{smtp6allowed.join(' ')});"