Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

[mirror/dsa-puppet.git] / modules / ferm / manifests / init.pp

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index d67f8fb..a6dcf1e 100644 (file)
--- 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,
@@ -26,6 +26,7 @@ class ferm {
             force   => true,
             recurse => true,
             source  => "puppet:///files/empty/",
+            notify  => Exec["ferm restart"],
             require => Package["ferm"];
         "/etc/ferm":
             ensure  => directory,
@@ -59,7 +60,7 @@ class ferm {
             notify  => Exec["ferm restart"];
         "/etc/logrotate.d/ulogd":
             source => "puppet:///modules/ferm/logrotate-ulogd",
-            require => Package["logrotate"],
+            require => Package["debian.org"],
             ;
     }
 
@@ -69,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",