From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 8 Nov 2009 20:05:19 +0000 (-0200)
Subject: Better definition for docroot check
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=2382aa5068da1f050698dcafca3a4509bded67cc;p=puppet-apache.git

Better definition for docroot check
---

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}"], 
           }
         }