summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authordavid <david@f03ff2f1-f02d-0410-970d-b9634babeaa1>2007-08-01 08:03:00 +0000
committerdavid <david@f03ff2f1-f02d-0410-970d-b9634babeaa1>2007-08-01 08:03:00 +0000
commite95d077173e662da9fbe5a4efbb8993c29c38c5a (patch)
tree2cd8ce32b015dd3c23cfb5314698049b1974a340 /manifests
parent550b18c797113d0d3ebad08d5ba5f4b3f78674ed (diff)
add forcible purging of directories
git-svn-id: http://club.black.co.at:82/svn/manifests/trunk@138 f03ff2f1-f02d-0410-970d-b9634babeaa1
Diffstat (limited to 'manifests')
-rw-r--r--manifests/defines/concatenated_file.pp2
-rw-r--r--manifests/init.pp2
2 files changed, 2 insertions, 2 deletions
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" ]: