X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Finit.pp;h=a6dcf1e70a667aced5f71c4f67e72f5df9e6772d;hb=99ed9a8b3de0955483a1036b6520accf8c02f755;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..a6dcf1e70 100644
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -1,5 +1,5 @@
 class ferm {
-    define rule($domain="ip", $chain="INPUT", $rule, $description="", $prio="00") {
+    define rule($domain="ip", $table="filter", $chain="INPUT", $rule, $description="", $prio="00", $notarule=false) {
         file {
             "/etc/ferm/dsa.d/${prio}_${name}":
                 ensure  => present,
@@ -19,23 +19,27 @@ class ferm {
             ulogd: ensure => installed;
     }
 
-    file { 
+    file {
         "/etc/ferm/dsa.d":
             ensure => directory,
             purge   => true,
             force   => true,
             recurse => true,
             source  => "puppet:///files/empty/",
+            notify  => Exec["ferm restart"],
             require => Package["ferm"];
+        "/etc/ferm":
+            ensure  => directory,
+            mode    => 0755;
         "/etc/ferm/conf.d":
             ensure => directory,
             require => Package["ferm"];
         "/etc/default/ferm":
-            source  => "puppet:///ferm/ferm.default",
+            source  => "puppet:///modules/ferm/ferm.default",
             require => Package["ferm"],
             notify  => Exec["ferm restart"];
         "/etc/ferm/ferm.conf":
-            source  => "puppet:///ferm/ferm.conf",
+            source  => "puppet:///modules/ferm/ferm.conf",
             require => Package["ferm"],
             mode    => 0400,
             notify  => Exec["ferm restart"];
@@ -54,6 +58,10 @@ class ferm {
             require => Package["ferm"],
             mode    => 0400,
             notify  => Exec["ferm restart"];
+        "/etc/logrotate.d/ulogd":
+            source => "puppet:///modules/ferm/logrotate-ulogd",
+            require => Package["debian.org"],
+            ;
     }
 
     $munin_ips = split(regsubst($v4ips, '([^,]+)', 'ip_\1', 'G'), ',')
@@ -62,12 +70,14 @@ class ferm {
         $munin_ips: script => "ip_";
     }
 
-    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"];
+    case getfromhash($nodeinfo, 'buildd') {
+        true: {
+            file {
+                "/etc/ferm/conf.d/load_ftp_conntrack.conf":
+                    source => "puppet:///modules/ferm/conntrack_ftp.conf",
+                    require => Package["ferm"],
+                    notify  => Exec["ferm restart"];
+            }
         }
     }