X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fferm%2Fmanifests%2Finit.pp;h=0d93d3aeb40a991363582805b2a54f97b4c641ea;hb=55da564501d8f0708cdebee93fae91b2f7e00d3a;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..0d93d3aeb 100644
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -18,6 +18,10 @@ class ferm {
                 "/etc/ferm/conf.d": 
                         ensure => directory,
                         require => Package["ferm"];
+                "/etc/ferm/ferm.conf":
+                        source  => "puppet:///ferm/ferm.conf",
+                        require => Package["ferm"],
+                        notify  => Exec["ferm restart"];
                 "/etc/ferm/conf.d/me.conf":
                         content => template("ferm/me.conf.erb"),
                         require => Package["ferm"],
@@ -29,7 +33,6 @@ class ferm {
                 rule            => "proto tcp dport ssh ACCEPT"
         }
 
-        ferm_rule(
         exec { "ferm restart":
                 path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
                 refreshonly => true,