X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=7e959d4fd722b4ebac85c7a138f25d6a84407513;hb=4fea88ca758ac7f9a4a1a6909040403245004727;hp=d1ef84cbf911bd93219699d6e88870a53ac548bd;hpb=102f1af5ae880499162af9fa37a5a6871c8c2f94;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index d1ef84cbf..7e959d4fd 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,7 +15,7 @@ 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'
@@ -32,8 +32,10 @@ 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 = []