From: Stephen Gran <steve@lobefin.net>
Date: Mon, 8 Mar 2010 23:54:50 +0000 (+0000)
Subject: enable the nf_ftp_conntrack hook
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=2f4efa8f024bfc51971b663e0e53b91432b30d35;p=mirror%2Fdsa-puppet.git

enable the nf_ftp_conntrack hook

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/ferm/files/conntrack_ftp.conf b/modules/ferm/files/conntrack_ftp.conf
index 2b855fb13..d8c3a516b 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 2663852c0..b565a5a1d 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': {}