summaryrefslogtreecommitdiff
path: root/manifests/vhost/php/drupal.pp
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2011-10-08 19:22:40 +0200
committermh <mh@immerda.ch>2011-10-08 19:22:40 +0200
commit2fa748dcc92e34b13bd4b6f7e452ef89b29490c4 (patch)
treef3827bd2c8cc3206b4f2a5a8a09b4951940d6cc4 /manifests/vhost/php/drupal.pp
parent24c047d1cfc54c003eef7445e177e28f373c1da4 (diff)
introduce a new template style, less duplicated things, more handy options
Diffstat (limited to 'manifests/vhost/php/drupal.pp')
-rw-r--r--manifests/vhost/php/drupal.pp25
1 files changed, 17 insertions, 8 deletions
diff --git a/manifests/vhost/php/drupal.pp b/manifests/vhost/php/drupal.pp
index adf1b9e..f81bef3 100644
--- a/manifests/vhost/php/drupal.pp
+++ b/manifests/vhost/php/drupal.pp
@@ -47,10 +47,8 @@ define apache::vhost::php::drupal(
$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',
@@ -61,6 +59,7 @@ define apache::vhost::php::drupal(
$mod_security_additional_options = 'absent',
$ssl_mode = false,
$vhost_mode = 'template',
+ $template_partial = 'apache/vhosts/php_drupal/partial.erb',
$vhost_source = 'absent',
$vhost_destination = 'absent',
$htpasswd_file = 'absent',
@@ -90,6 +89,17 @@ define apache::vhost::php::drupal(
owner => root, group => 0, mode => 0644;
}
}
+
+ $std_drupal_php_settings = {
+ magic_quotes_gpc => 0,
+ register_globals => 0,
+ 'session.auto_start' => 0,
+ 'mbstring.http_input' => 'pass',
+ 'mbstring.http_output' => 'pass',
+ 'mbstring.encoding_translation' => 0,
+ }
+
+ $drupal_php_settings = hash_merg($std_drupal_php_settings, $php_settings)
# create vhost configuration file
::apache::vhost::php::webapp{$name:
@@ -109,10 +119,8 @@ define apache::vhost::php::drupal(
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 => $drupal_php_settings,
+ php_options => $php_options,
do_includes => $do_includes,
options => $options,
additional_options => $additional_options,
@@ -123,6 +131,7 @@ define apache::vhost::php::drupal(
mod_security_additional_options => $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,