From 2fa748dcc92e34b13bd4b6f7e452ef89b29490c4 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Sat, 8 Oct 2011 19:22:40 +0200
Subject: introduce a new template style, less duplicated things, more handy
 options

---
 manifests/vhost/php/typo3.pp | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

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

diff --git a/manifests/vhost/php/typo3.pp b/manifests/vhost/php/typo3.pp
index 9d404a4..b12b6c1 100644
--- a/manifests/vhost/php/typo3.pp
+++ b/manifests/vhost/php/typo3.pp
@@ -19,12 +19,6 @@
 #    - false: don't activate mod_security
 #    - true: (*default*) activate mod_security
 #
-# php_safe_mode_exec_bins: An array of local binaries which should be linked in the
-#                          safe_mode_exec_bin for this hosting
-#                          *default*: None
-# php_default_charset: default charset header for php.
-#                      *default*: absent, which will set the same as default_charset
-#                                 of apache
 # logmode:
 #   - default: Do normal logging to CustomLog and ErrorLog
 #   - nologs: Send every logging to /dev/null
@@ -46,10 +40,8 @@ define apache::vhost::php::typo3(
     $run_uid = 'absent',
     $run_gid = 'absent',
     $allow_override = 'None',
-    $php_upload_tmp_dir = 'absent',
-    $php_session_save_path = 'absent',
-    $php_safe_mode_exec_bins = 'absent',
-    $php_default_charset = 'absent',
+    $php_settings = {},
+    $php_options = {},
     $do_includes = false,
     $options = 'absent',
     $additional_options = 'absent',
@@ -60,6 +52,7 @@ define apache::vhost::php::typo3(
     $mod_security_additional_options = 'absent',
     $ssl_mode = false,
     $vhost_mode = 'template',
+    $template_partial = 'apache/vhosts/php_typo3/partial.erb',
     $vhost_source = 'absent',
     $vhost_destination = 'absent',
     $htpasswd_file = 'absent',
@@ -87,6 +80,12 @@ define apache::vhost::php::typo3(
     } else {
       $real_mod_security_additional_options = $mod_security_additional_options
     }
+    
+    $typo3_php_options = {
+      # turn allow_url_fopen on for the extension manager fetch
+      allow_url_fopen => 'On'
+    }
+    $real_php_settings = hash_merge($typo3_php_settings,$php_settings)
 
     # create vhost configuration file
     ::apache::vhost::php::webapp{$name:
@@ -96,7 +95,6 @@ define apache::vhost::php::typo3(
         server_admin => $server_admin,
         logmode => $logmode,
         path => $path,
-        template_mode => 'php_typo3',
         owner => $owner,
         group => $group,
         documentroot_owner => $documentroot_owner,
@@ -106,10 +104,8 @@ define apache::vhost::php::typo3(
         run_uid => $run_uid,
         run_gid => $run_gid,
         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,
-        php_default_charset => $php_default_charset,
+        php_settings => $real_php_settings,
+        php_options => $php_options,
         do_includes => $do_includes,
         options => $options,
         additional_options => $additional_options,
@@ -120,6 +116,7 @@ define apache::vhost::php::typo3(
         mod_security_additional_options => $real_mod_security_additional_options,
         ssl_mode => $ssl_mode,
         vhost_mode => $vhost_mode,
+        template_partial => $template_partial,
         vhost_source => $vhost_source,
         vhost_destination => $vhost_destination,
         htpasswd_file => $htpasswd_file,
-- 
cgit v1.2.3