documentroot_recurse parameter for apache::vhost::webdir fcn

2 files changed, 9 insertions, 3 deletions

diff --git a/manifests/defines/configuration.pp b/manifests/defines/configuration.pp
index 6182f83..483d8e6 100644
--- a/manifests/defines/configuration.pp
+++ b/manifests/defines/configuration.pp
@@ -54,7 +54,8 @@ define apache::vhost::webdir(
     $group = 0,
     $documentroot_owner = apache,
     $documentroot_group = 0,
-    $documentroot_mode = 0640
+    $documentroot_mode = 0640,
+    $documentroot_recurse = false
 ){
     $real_path = $path ? {
         'absent' => $operatingsystem ? {
@@ -99,9 +100,14 @@ define apache::vhost::webdir(
         ensure => directory,
         owner => $owner, group => $group, mode => '0755';
     }
+    case $documentroot_recurse {
+      '': { $real_documentroot_recurse = false }
+      default: { $real_documentroot_recurse = $documentroot_recurse }
+    }
     file{"$documentroot":
         ensure => directory,
-        owner => $real_documentroot_owner, group => $real_documentroot_group, mode => $documentroot_mode;
+        owner => $real_documentroot_owner, group => $real_documentroot_group, mode => $documentroot_mode,
+        recurse => $real_documentroot_recurse;
     }
     file{$logdir:
         ensure => directory,
diff --git a/manifests/defines/vhost_varieties.pp b/manifests/defines/vhost_varieties.pp
index ec6fa03..f54affb 100644
--- a/manifests/defines/vhost_varieties.pp
+++ b/manifests/defines/vhost_varieties.pp
@@ -241,7 +241,7 @@ define apache::vhost::php::joomla(
         documentroot_owner => $documentroot_owner,
         documentroot_group => $documentroot_group,
         documentroot_mode => $documentroot_mode,
-        recurse => true,
+        documentroot_recurse => true,
 	require => Git::Clone["git_clone_$name"],
     }