From: Martin Zobel-Helas <zobel@debian.org>
Date: Sun, 25 Jul 2010 12:55:25 +0000 (+0200)
Subject: Revert "older ferm syntax"
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=f33509a3d3e89536bbd70fbc9df310b90dd88f45;p=mirror%2Fdsa-puppet.git

Revert "older ferm syntax"

This reverts commit 4fea88ca758ac7f9a4a1a6909040403245004727.
---

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 7e959d4fd..87e0b4007 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -33,8 +33,8 @@ 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";'
+	out << '@hook pre "/sbin/modprobe nf_conntrack_sip";'
+	out << '@hook pre "/sbin/modprobe nf_conntrack_h323";'
 end
 
 smtp4allowed = []