From 2f4efa8f024bfc51971b663e0e53b91432b30d35 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Mon, 8 Mar 2010 23:54:50 +0000 Subject: [PATCH] enable the nf_ftp_conntrack hook Signed-off-by: Stephen Gran --- modules/ferm/files/conntrack_ftp.conf | 2 +- modules/ferm/manifests/init.pp | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/ferm/files/conntrack_ftp.conf b/modules/ferm/files/conntrack_ftp.conf index 2b855fb1..d8c3a516 100644 --- a/modules/ferm/files/conntrack_ftp.conf +++ b/modules/ferm/files/conntrack_ftp.conf @@ -1 +1 @@ -@hook pre 'modprobe nf_conntrack_ftp || true'" +hook pre 'modprobe nf_conntrack_ftp || true'; diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp index 2663852c..b565a5a1 100644 --- a/modules/ferm/manifests/init.pp +++ b/modules/ferm/manifests/init.pp @@ -62,16 +62,16 @@ class ferm { $munin_ips: script => "ip_"; } -# case extractnodeinfo($nodeinfo, 'buildd') { -# 'true': { -# file { -# "/etc/ferm/conf.d/load_ftp_conntrack.conf": -# source => "puppet:///ferm/conntrack_ftp.conf", -# require => Package["ferm"], -# notify => Exec["ferm restart"]; -# } -# } -# } + case extractnodeinfo($nodeinfo, 'buildd') { + 'true': { + file { + "/etc/ferm/conf.d/load_ftp_conntrack.conf": + source => "puppet:///ferm/conntrack_ftp.conf", + require => Package["ferm"], + notify => Exec["ferm restart"]; + } + } + } case $v6ips { 'no': {} -- 2.39.2