]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
Revert "add pre-hook for cilea to load nf_conntrack_sip and nf_conntrack_h323"
authorMartin Zobel-Helas <zobel@debian.org>
Sun, 25 Jul 2010 12:55:36 +0000 (14:55 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Sun, 25 Jul 2010 12:55:36 +0000 (14:55 +0200)
This reverts commit 3ecf7721c32e4e34ee964ec57ac581ae44aca8ba.

modules/ferm/templates/me.conf.erb

index 87e0b40075ad8ab02c985214940cd6a37f196676..0ff422b3772640ad94d0738719def20499574346 100644 (file)
@@ -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 = []