and actually ship it

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

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index 4157049..84fc808 100644 (file)
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -11,7 +11,7 @@ class ferm {
        }
 
         # realize (i.e. enable) all @ferm::rule virtual resources
-        Rule <| |>
+        Ferm::Rule <| |>
 
         package { ferm: ensure => installed }
 
@@ -21,6 +21,7 @@ class ferm {
                         purge   => true,
                         force   => true,
                         recurse => true,
+                        source  => "puppet:///files/empty/",
                         require => Package["ferm"];
                 "/etc/ferm/conf.d":
                         ensure => directory,
@@ -36,7 +37,12 @@ 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"];