X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Finit.pp;h=71964c4295a5cff1c0591ecea51f0233443e6801;hb=ed3381df54de9d6211f1a522d77894dcb2437e94;hp=9eec4b8ee480dd07089e7d7c294e668c1976ad5c;hpb=cac501a3df10b94be7c989b33711889ddffb6e84;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index 9eec4b8ee..71964c429 100644
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -1,5 +1,5 @@
 class ferm {
-    define rule($domain="ip", $table="filter", $chain="INPUT", $rule, $description="", $prio="00") {
+    define rule($domain="ip", $table="filter", $chain="INPUT", $rule, $description="", $prio="00", $notarule=false) {
         file {
             "/etc/ferm/dsa.d/${prio}_${name}":
                 ensure  => present,
@@ -70,8 +70,8 @@ class ferm {
         $munin_ips: script => "ip_";
     }
 
-    case extractnodeinfo($nodeinfo, 'buildd') {
-        'true': {
+    case getfromhash($nodeinfo, 'buildd') {
+        true: {
             file {
                 "/etc/ferm/conf.d/load_ftp_conntrack.conf":
                     source => "puppet:///modules/ferm/conntrack_ftp.conf",