From: david <david@f03ff2f1-f02d-0410-970d-b9634babeaa1>
Date: Wed, 1 Aug 2007 08:03:00 +0000 (+0000)
Subject: add forcible purging of directories
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=e95d077173e662da9fbe5a4efbb8993c29c38c5a;p=puppet-common.git

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 35590fa..eeed8dc 100644
--- 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 fc6b481..141d8b2 100644
--- 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" ]: