add forcible purging of directories

git-svn-id: http://club.black.co.at:82/svn/manifests/trunk@138 f03ff2f1-f02d-0410-970d-b9634babeaa1

diff --git a/manifests/defines/concatenated_file.pp b/manifests/defines/concatenated_file.pp
index 35590fa68223ae8addfead974046d9decf53f91f..eeed8dcc88954e0f07db522376ec80714e14619c 100644 (file)
--- a/manifests/defines/concatenated_file.pp
+++ b/manifests/defines/concatenated_file.pp
@@ -21,7 +21,7 @@ define concatenated_file (
                $dir:
                        source => "puppet://$servername/common/empty",
                        checksum => mtime,
-                       recurse => true, purge => true,
+                       recurse => true, purge => true, force => true,
                        mode => $mode, owner => $owner, group => $group;
                $name:
                        ensure => present, checksum => md5,

diff --git a/manifests/init.pp b/manifests/init.pp
index fc6b48187164dca77c3359ec425125e56aeaa57f..141d8b27ff009a4a53266ed6bbbc6b0f810054a2 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -8,7 +8,7 @@ file {
        "/var/lib/puppet/modules":
                ensure => directory,
                source => "puppet://$servername/common/modules/",
-               recurse => true, purge => true,
+               recurse => true, purge => true, force => true,
                mode => 0755, owner => root, group => root;
        # prepare directories to drop various puppet enhancements
        [ "$rubysitedir/puppet", "$rubysitedir/facter" ]: