X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Finit.pp;h=84fc808d735283d09b5b004793c54243881a98cf;hb=c46d1f99d0294179797fb90e3b9fc5b44780bde5;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..84fc808d7 100644
--- 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"];