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

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 7e959d4fd..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 = []