From 8f0a4916ad6d42de12ae3aca3110e8e5b59bfe1b Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Wed, 18 Nov 2009 23:50:53 +0100
Subject: group php options together

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

diff --git a/manifests/vhost/php/typo3.pp b/manifests/vhost/php/typo3.pp
index ccca1f8..6aa5293 100644
--- a/manifests/vhost/php/typo3.pp
+++ b/manifests/vhost/php/typo3.pp
@@ -21,6 +21,7 @@ define apache::vhost::php::typo3(
     $allow_override = 'None',
     $php_upload_tmp_dir = 'absent',
     $php_session_save_path = 'absent',
+    $php_safe_mode_exec_bins = 'absent',
     $do_includes = false,
     $options = 'absent',
     $additional_options = 'absent',
@@ -34,8 +35,7 @@ define apache::vhost::php::typo3(
     $htpasswd_path = 'absent',
     $manage_config = true,
     $config_webwriteable = false,
-    $manage_directories = true,
-    $php_safe_mode_exec_bins = 'absent'
+    $manage_directories = true
 ){
     $documentroot = $path ? {
         'absent' => $operatingsystem ? {
@@ -64,6 +64,7 @@ define apache::vhost::php::typo3(
         allow_override => $allow_override,
         php_upload_tmp_dir => $php_upload_tmp_dir,
         php_session_save_path => $php_session_save_path,
+        php_safe_mode_exec_bins => $php_safe_mode_exec_bins,
         do_includes => $do_includes,
         options => $options,
         additional_options => $additional_options,
@@ -95,7 +96,6 @@ 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