summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2009-11-08 18:05:19 -0200
committerSilvio Rhatto <rhatto@riseup.net>2009-11-08 18:05:19 -0200
commit2382aa5068da1f050698dcafca3a4509bded67cc (patch)
treeabd93e94fb3c885a7522ce8d3b41dc5fa7b23500 /manifests
parent9cfd713030b3f10c69f33c75b21dedfb4a40a719 (diff)
downloadpuppet-apache-2382aa5068da1f050698dcafca3a4509bded67cc.tar.gz
puppet-apache-2382aa5068da1f050698dcafca3a4509bded67cc.tar.bz2
Better definition for docroot check
Diffstat (limited to 'manifests')
-rw-r--r--manifests/init.pp3
1 files changed, 2 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index c0362ed..0580042 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -120,9 +120,10 @@ class apache {
recurse => false,
}
}
- if !defined(Exec["/bin/mkdir -p ${docroot}"]) {
+ if !defined(Exec["check_docroot_${docroot}"]) {
# Ensure parent folder exist
exec { "/bin/mkdir -p ${docroot}":
+ unless => "/bin/sh -c '[ -e ${docroot} ]'",
before => File["${docroot}"],
}
}