]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
Revert "older ferm syntax"
authorMartin Zobel-Helas <zobel@debian.org>
Sun, 25 Jul 2010 12:55:25 +0000 (14:55 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Sun, 25 Jul 2010 12:55:25 +0000 (14:55 +0200)
This reverts commit 4fea88ca758ac7f9a4a1a6909040403245004727.

modules/ferm/templates/me.conf.erb

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