From: Martin Zobel-Helas <zobel@debian.org>
Date: Sun, 25 Jul 2010 12:47:49 +0000 (+0200)
Subject: add pre-hook for cilea to load nf_conntrack_sip and nf_conntrack_h323
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=3ecf7721c32e4e34ee964ec57ac581ae44aca8ba;p=mirror%2Fdsa-puppet.git

add pre-hook for cilea to load nf_conntrack_sip and nf_conntrack_h323
---

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 0ff422b37..87e0b4007 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -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 = []