Add logrotate.d/ulogd

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

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index d58e440a3302a5faeb7e7b3f4abc933bc9ba1291..45d14d47425a8851b1f0cdf83278995c35702a7b 100644 (file)
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -17,9 +17,10 @@ class ferm {
     package {
             ferm: ensure => installed;
             ulogd: ensure => installed;
+            logrotate: ensure => installed;
     }
 
-    file { 
+    file {
         "/etc/ferm/dsa.d":
             ensure => directory,
             purge   => true,
@@ -54,6 +55,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 +68,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"];
+            }
         }
     }