From 87d285ecf3bdf38e97df3c076fb8dd62a449a332 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Mon, 8 Mar 2010 17:52:03 +0000 Subject: [PATCH] a stab at auto loading conntrack modules Signed-off-by: Stephen Gran --- modules/ferm/files/conntrack_ftp.conf | 1 + modules/ferm/manifests/init.pp | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 modules/ferm/files/conntrack_ftp.conf diff --git a/modules/ferm/files/conntrack_ftp.conf b/modules/ferm/files/conntrack_ftp.conf new file mode 100644 index 00000000..2b855fb1 --- /dev/null +++ b/modules/ferm/files/conntrack_ftp.conf @@ -0,0 +1 @@ +@hook pre 'modprobe nf_conntrack_ftp || true'" diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp index 8ce448ec..d58e440a 100644 --- a/modules/ferm/manifests/init.pp +++ b/modules/ferm/manifests/init.pp @@ -62,6 +62,15 @@ class ferm { $munin_ips: script => "ip_"; } + case extractnodeinfo($nodeinfo, 'buildd') { + file { + "/etc/ferm/conf.d/load_ftp_conntrack.conf": + source => "puppet:///ferm/ferm.default", + require => Package["ferm"], + notify => Exec["ferm restart"]; + } + } + case $v6ips { 'no': {} default: { -- 2.39.2