From 8a30f43b186e967421fd550aa117a56dda869938 Mon Sep 17 00:00:00 2001
From: Andreas <andreas@immerda.ch>
Date: Wed, 18 Nov 2009 18:43:30 +0100
Subject: renames and proc move from webhosting for php_safe_mode_exec_bins

---
 manifests/vhost/php/typo3.pp | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'manifests/vhost/php/typo3.pp')

diff --git a/manifests/vhost/php/typo3.pp b/manifests/vhost/php/typo3.pp
index dcc10bc..ccca1f8 100644
--- a/manifests/vhost/php/typo3.pp
+++ b/manifests/vhost/php/typo3.pp
@@ -19,7 +19,6 @@ define apache::vhost::php::typo3(
     $run_uid = 'absent',
     $run_gid = 'absent',
     $allow_override = 'None',
-    $php_bin_dir = 'absent',
     $php_upload_tmp_dir = 'absent',
     $php_session_save_path = 'absent',
     $do_includes = false,
@@ -35,7 +34,8 @@ define apache::vhost::php::typo3(
     $htpasswd_path = 'absent',
     $manage_config = true,
     $config_webwriteable = false,
-    $manage_directories = true
+    $manage_directories = true,
+    $php_safe_mode_exec_bins = 'absent'
 ){
     $documentroot = $path ? {
         'absent' => $operatingsystem ? {
@@ -45,14 +45,6 @@ define apache::vhost::php::typo3(
         default => "${path}/www"
     }
 
-    $php_bin_dir = $path ? {
-        'absent' => $operatingsystem ? {
-            openbsd => "/var/www/htdocs/${name}/bin",
-            default => "/var/www/vhosts/${name}/bin"
-        },
-        default => "${path}/bin"
-    }
-
     # create vhost configuration file
     ::apache::vhost::php::webapp{$name:
         ensure => $ensure,
@@ -70,7 +62,6 @@ define apache::vhost::php::typo3(
         run_uid => $run_uid,
         run_gid => $run_gid,
         allow_override => $allow_override,
-        php_bin_dir => $php_bin_dir,
         php_upload_tmp_dir => $php_upload_tmp_dir,
         php_session_save_path => $php_session_save_path,
         do_includes => $do_includes,
@@ -104,6 +95,7 @@ define apache::vhost::php::typo3(
                                   "$documentroot/fileadmin/_temp_"
                                 ],
         manage_config => $manage_config,
+        php_safe_mode_exec_bins => $php_safe_mode_exec_bins,
     }
 
 }
-- 
cgit v1.2.3