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

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index 467af752f..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,
@@ -26,6 +26,7 @@ class ferm {
             force   => true,
             recurse => true,
             source  => "puppet:///files/empty/",
+            notify  => Exec["ferm restart"],
             require => Package["ferm"];
         "/etc/ferm":
             ensure  => directory,
@@ -34,11 +35,11 @@ class ferm {
             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"];
@@ -58,8 +59,8 @@ class ferm {
             mode    => 0400,
             notify  => Exec["ferm restart"];
         "/etc/logrotate.d/ulogd":
-            source => "puppet:///ferm/logrotate-ulogd",
-            require => Package["logrotate"],
+            source => "puppet:///modules/ferm/logrotate-ulogd",
+            require => Package["debian.org"],
             ;
     }
 
@@ -69,11 +70,11 @@ 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:///ferm/conntrack_ftp.conf",
+                    source => "puppet:///modules/ferm/conntrack_ftp.conf",
                     require => Package["ferm"],
                     notify  => Exec["ferm restart"];
             }