X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=0ff422b3772640ad94d0738719def20499574346;hb=fc8a2e887766e10b6c33a00c547049d6bf38801c;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..0ff422b37 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -32,10 +32,8 @@ 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 = []