include php default dirs if we want to add subdirs

3 files changed, 34 insertions, 34 deletions

diff --git a/manifests/defaultdavdbdir.pp b/manifests/defaultdavdbdir.pp
index 8b5e00f..186871c 100644
--- a/manifests/defaultdavdbdir.pp
+++ b/manifests/defaultdavdbdir.pp
@@ -1,5 +1,3 @@
-# manifests/defaultphpdirs.pp
-
 class apache::defaultdavdbdir {
     file{'/var/www/dav_db_dir':
         ensure => directory,
diff --git a/manifests/defaultphpdirs.pp b/manifests/defaultphpdirs.pp
index fdbe8a5..eba060a 100644
--- a/manifests/defaultphpdirs.pp
+++ b/manifests/defaultphpdirs.pp
@@ -1,5 +1,3 @@
-# manifests/defaultphpdirs.pp
-
 class apache::defaultphpdirs {
     file{'/var/www/upload_tmp_dir':
         ensure => directory,
diff --git a/manifests/vhost/phpdirs.pp b/manifests/vhost/phpdirs.pp
index 135c43c..5936da6 100644
--- a/manifests/vhost/phpdirs.pp
+++ b/manifests/vhost/phpdirs.pp
@@ -1,35 +1,39 @@
 define apache::vhost::phpdirs(
-    $ensure = present,
-    $php_upload_tmp_dir,
-    $php_session_save_path,
-    $documentroot_owner = apache,
-    $documentroot_group = 0,
-    $documentroot_mode = 0750,
-    $run_mode = 'normal',
-    $run_uid = 'absent'
+  $ensure = present,
+  $php_upload_tmp_dir,
+  $php_session_save_path,
+  $documentroot_owner = apache,
+  $documentroot_group = 0,
+  $documentroot_mode = 0750,
+  $run_mode = 'normal',
+  $run_uid = 'absent'
 ){
-    case $ensure {
-        absent: {
-            file{[$php_upload_tmp_dir, $php_session_save_path ]:
-                ensure => absent,
-                purge => true,
-                force => true,
-                recurse => true,
-            }
-        }
-        default: {
-            file{[$php_upload_tmp_dir, $php_session_save_path ]:
-                ensure => directory,
-                owner => $run_mode ? {
-                    'itk' => $run_uid,
-                    'static-itk' => $run_uid,
-                    'proxy-itk' => $run_uid,
-                    'fcgid' => $run_uid,
-                    default => $documentroot_owner
-                },
-                group => $documentroot_group, mode => $documentroot_mode;
-            }
-        }
+  case $ensure {
+    absent : {
+      file {
+        [$php_upload_tmp_dir, $php_session_save_path] :
+          ensure => absent,
+          purge => true,
+          force => true,
+          recurse => true,
+      }
     }
+    default : {
+      include apache::defaultphpdirs
+      file {
+        [$php_upload_tmp_dir, $php_session_save_path] :
+          ensure => directory,
+          owner => $run_mode ? {
+            'itk' => $run_uid,
+            'static-itk' => $run_uid,
+            'proxy-itk' => $run_uid,
+            'fcgid' => $run_uid,
+            default => $documentroot_owner
+          },
+          group => $documentroot_group,
+          mode => $documentroot_mode ;
+      }
+    }
+  }
 }