X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Finit.pp;h=5f63ea7c1af47174de7ecbb540e141494704ade8;hb=decbf68aa45f1398cdc1ad8882048296f1e8935c;hp=a8798c82a49654ebf0e68c78d4f61a79f2588f25;hpb=1cff95615ab0baf6f5e8f6db3a5611ab0a232256;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index a8798c82a..5f63ea7c1 100644
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -4,34 +4,63 @@ class ferm {
 	                ensure  => present,
 	                owner   => root,
 	                group   => root,
-	                mode    => 0600,
+	                mode    => 0400,
 	                content => template("ferm/ferm-rule.erb"),
+                        notify  => Exec["ferm restart"],
 	        }
 	}
 
+        # realize (i.e. enable) all @ferm::rule virtual resources
+        Ferm::Rule <| |>
+
         package { ferm: ensure => installed }
 
         file { 
-                "/etc/ferm/dsa.d": 
+                "/etc/ferm/dsa.d":
                         ensure => directory,
+                        purge   => true,
+                        force   => true,
+                        recurse => true,
+                        source  => "puppet:///files/empty/",
                         require => Package["ferm"];
-                "/etc/ferm/conf.d": 
+                "/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"],
+                        mode    => 0400,
+                        notify  => Exec["ferm restart"];
                 "/etc/ferm/conf.d/me.conf":
                         content => template("ferm/me.conf.erb"),
                         require => Package["ferm"],
+                        mode    => 0400,
+                        notify  => Exec["ferm restart"];
+                "/etc/ferm/conf.d/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"];
         }
 
-        ferm::rule { "dsa-ssh":
-                description     => "Allow SSH from DSA",
-                rule            => "proto tcp dport ssh ACCEPT"
+        $munin_ips = split(regsubst($v4ips, '([^,]+)', 'ip_\1', 'G'), ',')
+
+        activate_munin_check {
+            $munin_ips: script => "ip_";
         }
 
-        ferm_rule(
         exec { "ferm restart":
-                path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
+                command     => "/etc/init.d/ferm restart",
                 refreshonly => true,
         }
+
 }