open ullmann pg fw up for franck and coccia

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

diff --git a/modules/ferm/manifests/conf.pp b/modules/ferm/manifests/conf.pp
index dd3bb0c8f4983a74df972febb8c30dbccf7b2543..0dffa773d9798bce293bf9f48e5c83ca6fd8819f 100644 (file)
--- a/modules/ferm/manifests/conf.pp
+++ b/modules/ferm/manifests/conf.pp
@@ -1,4 +1,6 @@
-define ferm::conf ($content, $source) {
+define ferm::conf ($content=undef, $source=undef, $ensure=present) {
+
+       include ferm
 
        case $ensure {
                present,absent: {}
@@ -9,15 +11,19 @@ define ferm::conf ($content, $source) {
                fail ( "Can't define both source and content for ${name}" )
        }
 
+       $fname = "/etc/ferm/conf.d/${name}.conf"
+
        if $source {
-               file { "/etc/ferm/conf.d/${name}":
+               file { $fname:
                        ensure => $ensure,
-                       source => $source
+                       source => $source,
+                       notify => Service['ferm']
                }
        } elsif $content {
-               file { "/etc/ferm/conf.d/${name}":
+               file { $fname:
                        ensure  => $ensure,
                        content => $content,
+                       notify => Service['ferm']
                }
        }
 }