X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=f2f13a3b420c2cf759f954b253f8005568205560;hb=aba2c91f63d0b34dbd5e8f89f16dcf8b79c39d9a;hp=f1f9ad15e782de578000e793663dc4c3df3388ee;hpb=6d43335dee4250b017a9c850b0746c44bba60c7c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index f1f9ad15e..f2f13a3b4 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 beethoven tchaikovsky schroeder heininen handel lotti}
 
 ssh4allowed = []
 ssh6allowed = []
@@ -23,7 +23,7 @@ if %w{lebrun schroeder}.include?(hostname) then
 	ssh4allowed << '70.103.162.29' # master
 	ssh4allowed << '82.195.75.84'  # nott.ayous.org, HE (builddadm)
 end
-if %w{bartok beethoven}.include?(hostname) then
+if %w{beethoven}.include?(hostname) then
 	ssh4allowed << '$HOST_DEBIAN_V4'
 	ssh6allowed << '$HOST_DEBIAN_V6'
 end
@@ -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(' ')});"