From 60a018a310ec5a1d6aefec9f25d3483488e2042e Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Sun, 14 Dec 2008 15:48:44 +0000
Subject: put session and upload dir together, run user is owner of itk is used

---
 manifests/defines/vhost_varieties.pp | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'manifests/defines/vhost_varieties.pp')

diff --git a/manifests/defines/vhost_varieties.pp b/manifests/defines/vhost_varieties.pp
index 8e2d1b4..d2c5589 100644
--- a/manifests/defines/vhost_varieties.pp
+++ b/manifests/defines/vhost_varieties.pp
@@ -106,13 +106,6 @@ define apache::vhost::php::standard(
         }
         default: { $real_upload_tmp_dir = $upload_tmp_dir }
     }
-    file{$real_upload_tmp_dir:
-        ensure => directory,
-        owner => $documentroot_owner, 
-        group => $documentroot_group, 
-        mode => $documentroot_mode;
-    }
-
     # php session_save_path
     case $session_save_path {
         'absent': {
@@ -121,13 +114,15 @@ define apache::vhost::php::standard(
         }
         default: { $real_session_save_path = $session_save_path }
     }
-    file{"$real_session_save_path":
+    file{[$real_upload_tmp_dir, $real_session_save_path ]:
         ensure => directory,
-        owner => $documentroot_owner, 
+        owner => $run_mode ? {
+            'itk' => $run_uid,
+            default => $documentroot_owner
+        },
         group => $documentroot_group, 
         mode => $documentroot_mode;
     }
-
     # create webdir
     apache::vhost::webdir{$name:
         path => $path,
-- 
cgit v1.2.3