X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Finit.pp;h=3d35bae0c97df9a55a548219ba47e7bb362cc828;hb=6a9cfcfe08f4735c0a7a19346902dc1969a9264b;hp=ef43fb482e34e54a175dc242936b08a2a2f41872;hpb=c7f0dee872666fb46260b4d13e7d936826b39a5b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index ef43fb482..3d35bae0c 100644
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -4,37 +4,48 @@ 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/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":
+                        source  => "puppet:///ferm/defs.conf",
+                        require => Package["ferm"],
+                        mode    => 0400,
                         notify  => Exec["ferm restart"];
-        }
-
-        ferm::rule { "dsa-ssh":
-                description     => "Allow SSH from DSA",
-                rule            => "proto tcp mod state state (NEW) dport (ssh) @subchain 'ssh' { saddr ($MY_SSH_ACCEPT_HOSTS) ACCEPT; }
         }
 
         exec { "ferm restart":
-                path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
+                command     => "/etc/init.d/ferm restart",
                 refreshonly => true,
         }
+
 }