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

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 87e0b4007..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 = []
@@ -20,22 +20,25 @@ if %w{lebrun schroeder}.include?(hostname) then
 	out << '@def $KIBI = ( 88.164.242.219 );'
 	ssh4allowed << '$CARNET'
 	ssh4allowed << '$KIBI'
-	ssh4allowed << '82.195.75.84' # nott.ayous.org, HE (builddadm)
+	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
+if %w{geo1 geo2 geo3}.include?(hostname) then
+	ssh4allowed << '194.177.211.209' # orff - master
+	ssh6allowed << '2001:648:2ffc:deb:213:72ff:fe69:e188' # orff - master
+end
 ssh4allowed.length == 0 and ssh4allowed << '0.0.0.0/0'
 ssh6allowed.length == 0 and ssh6allowed << '::/0'
 
 out << "@def $SSH_SOURCES    = (#{ssh4allowed.join(' ')});"
 out << "@def $SSH_V6_SOURCES = (#{ssh6allowed.join(' ')});"
 
-if %w{cilea}.include?(hostname) then
-	out << '@hook pre "/sbin/modprobe nf_conntrack_sip";'
-	out << '@hook pre "/sbin/modprobe nf_conntrack_h323";'
-end
+
+
 
 smtp4allowed = []
 smtp6allowed = []
@@ -46,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(' ')});"