From d31dba6a24a7e391ad5f64e48337709cad8c712f Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 27 Dec 2009 10:15:08 -0200
Subject: Fixing docroot issue

---
 manifests/init.pp | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'manifests')

diff --git a/manifests/init.pp b/manifests/init.pp
index 360335f..8a02cc0 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -128,21 +128,23 @@ class apache {
 
     case $ensure {
       'present': {
-        if !defined(File["${docroot}"]) {
-          file { "${docroot}":
-            ensure  => present,
-            owner   => root,
-            group   => root,
-            mode    => 0755,
-            recurse => false,
+        if $docroot != false {
+          if !defined(File["${docroot}"]) {
+            file { "${docroot}":
+              ensure  => present,
+              owner   => root,
+              group   => root,
+              mode    => 0755,
+              recurse => false,
+            }
           }
-        }
-        if !defined(Exec["check_docroot_${docroot}"]) {
-          # Ensure parent folder exist
-          exec { "check_docroot_${docroot}":
-            command => "/bin/mkdir -p ${docroot}",
-            unless  => "/bin/sh -c '[ -e ${docroot} ]'",
-            before  => File["${docroot}"], 
+          if !defined(Exec["check_docroot_${docroot}"]) {
+            # Ensure parent folder exist
+            exec { "check_docroot_${docroot}":
+              command => "/bin/mkdir -p ${docroot}",
+              unless  => "/bin/sh -c '[ -e ${docroot} ]'",
+              before  => File["${docroot}"], 
+            }
           }
         }
         exec { "/usr/sbin/a2ensite $name":
-- 
cgit v1.2.3