X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Finit.pp;h=a6dcf1e70a667aced5f71c4f67e72f5df9e6772d;hb=99ed9a8b3de0955483a1036b6520accf8c02f755;hp=95da151e6354048f1d414e51f21f7f15031c6371;hpb=ed9c052bcce0377d8c9f1f7de79fe3114c8f8bf8;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index 95da151e6..a6dcf1e70 100644
--- 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,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",