X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Finit.pp;h=d49d9f8cf9adafce724fab4fa1a89e0994fd5433;hb=6fa2680c82607d511aa6933a7b1e010e78b42860;hp=a16e2c750220af57c23f120cadc023c4be09a7a0;hpb=2b268869732ac226ff2dffc934d5ca30b49bfc15;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index a16e2c750..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'), ',')
@@ -62,6 +66,27 @@ class ferm {
         $munin_ips: script => "ip_";
     }
 
+    case extractnodeinfo($nodeinfo, 'buildd') {
+        'true': {
+            file {
+                "/etc/ferm/conf.d/load_ftp_conntrack.conf":
+                    source => "puppet:///ferm/conntrack_ftp.conf",
+                    require => Package["ferm"],
+                    notify  => Exec["ferm restart"];
+            }
+        }
+    }
+
+    case $v6ips {
+        'no': {}
+        default: {
+            $munin6_ips = split(regsubst($v6ips, '([^,]+)', 'ip6_\1', 'G'), ',')
+            activate_munin_check {
+                $munin6_ips: script => "ip6_";
+            }
+        }
+    }
+
     exec {
         "ferm restart":
             command     => "/etc/init.d/ferm restart",