X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Finit.pp;h=b997d60899012e86fbaf05e51e8e8fd14db8af09;hb=fd6b464b0da569ba84e2f260a666c257b5773f93;hp=4157049d9154b37ba8afa41df352f83d44b05fce;hpb=a1a623c8c95076d6d2c13c0d8ed81860eae626ee;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index 4157049d9..b997d6089 100644
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -11,9 +11,12 @@ class ferm {
 	}
 
         # realize (i.e. enable) all @ferm::rule virtual resources
-        Rule <| |>
+        Ferm::Rule <| |>
 
-        package { ferm: ensure => installed }
+        package {
+                ferm: ensure => installed;
+                ulogd: ensure => installed;
+        }
 
         file { 
                 "/etc/ferm/dsa.d":
@@ -21,10 +24,15 @@ class ferm {
                         purge   => true,
                         force   => true,
                         recurse => true,
+                        source  => "puppet:///files/empty/",
                         require => Package["ferm"];
                 "/etc/ferm/conf.d":
                         ensure => directory,
                         require => Package["ferm"];
+                "/etc/default/ferm":
+                        source  => "puppet:///ferm/ferm.default",
+                        require => Package["ferm"],
+                        notify  => Exec["ferm restart"];
                 "/etc/ferm/ferm.conf":
                         source  => "puppet:///ferm/ferm.conf",
                         require => Package["ferm"],
@@ -36,10 +44,21 @@ class ferm {
                         mode    => 0400,
                         notify  => Exec["ferm restart"];
                 "/etc/ferm/conf.d/defs.conf":
-                        source  => "puppet:///ferm/defs.conf",
+                        content => template("ferm/defs.conf.erb"),
                         require => Package["ferm"],
                         mode    => 0400,
                         notify  => Exec["ferm restart"];
+                "/etc/ferm/conf.d/interfaces.conf":
+                        content => template("ferm/interfaces.conf.erb"),
+                        require => Package["ferm"],
+                        mode    => 0400,
+                        notify  => Exec["ferm restart"];
+        }
+
+        $munin_ips = split(regsubst($v4ips, '([^,]+)', 'ip_\1', 'G'), ',')
+
+        activate_munin_check {
+            $munin_ips: script => "ip_";
         }
 
         exec { "ferm restart":