this should virtually work

[dsa-puppet.git] / modules / ferm / manifests / init.pp

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index 0d93d3aeb40a991363582805b2a54f97b4c641ea..709effc4dcb1d9bfdecdad14720d68778a41ae4d 100644 (file)
--- 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
+        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 dport ssh ACCEPT"
         }
 
         exec { "ferm restart":
-                path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
+                command     => "/etc/init.d/ferm restart",
                 refreshonly => true,
         }
+
 }