X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Finit.pp;h=d49d9f8cf9adafce724fab4fa1a89e0994fd5433;hb=88e5344fecee3a372f760ba53b94e824c33d5c4f;hp=d58e440a3302a5faeb7e7b3f4abc933bc9ba1291;hpb=87d285ecf3bdf38e97df3c076fb8dd62a449a332;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index d58e440a3..d49d9f8cf 100644
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -19,7 +19,7 @@ class ferm {
             ulogd: ensure => installed;
     }
 
-    file { 
+    file {
         "/etc/ferm/dsa.d":
             ensure => directory,
             purge   => true,
@@ -54,6 +54,10 @@ class ferm {
             require => Package["ferm"],
             mode    => 0400,
             notify  => Exec["ferm restart"];
+        "/etc/logrotate.d/ulogd":
+            source => "puppet:///ferm/logrotate-ulogd",
+            require => Package["logrotate"],
+            ;
     }
 
     $munin_ips = split(regsubst($v4ips, '([^,]+)', 'ip_\1', 'G'), ',')
@@ -63,11 +67,13 @@ class ferm {
     }
 
     case extractnodeinfo($nodeinfo, 'buildd') {
-        file {
-            "/etc/ferm/conf.d/load_ftp_conntrack.conf":
-                source => "puppet:///ferm/ferm.default",
-                require => Package["ferm"],
-                notify  => Exec["ferm restart"];
+        'true': {
+            file {
+                "/etc/ferm/conf.d/load_ftp_conntrack.conf":
+                    source => "puppet:///ferm/conntrack_ftp.conf",
+                    require => Package["ferm"],
+                    notify  => Exec["ferm restart"];
+            }
         }
     }