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 7ade513..a6dcf1e 100644 (file)
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -60,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"],
             ;
     }
 
@@ -70,7 +70,7 @@ class ferm {
         $munin_ips: script => "ip_";
     }
 
-    case extractnodeinfo($nodeinfo, 'buildd') {
+    case getfromhash($nodeinfo, 'buildd') {
         true: {
             file {
                 "/etc/ferm/conf.d/load_ftp_conntrack.conf":