summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2011-10-08 20:43:19 +0200
committermh <mh@immerda.ch>2011-10-08 20:43:19 +0200
commit7991a88483f214d593a933ce97fc8a2adf44800e (patch)
treec931fb8ae1c30fba5f05dbfa677a281773446ee4 /manifests
parent539ac8f4e8dc64ae6a071c102859f5006aa609be (diff)
by default safe_mode is off for mediawikis
Diffstat (limited to 'manifests')
-rw-r--r--manifests/vhost/php/mediawiki.pp7
1 files changed, 6 insertions, 1 deletions
diff --git a/manifests/vhost/php/mediawiki.pp b/manifests/vhost/php/mediawiki.pp
index 58d36af..376f1be 100644
--- a/manifests/vhost/php/mediawiki.pp
+++ b/manifests/vhost/php/mediawiki.pp
@@ -58,6 +58,11 @@ define apache::vhost::php::mediawiki(
$htpasswd_file = 'absent',
$htpasswd_path = 'absent'
){
+
+ $mediawiki_php_settings = {
+ safe_mode => false,
+ }
+
# create vhost configuration file
::apache::vhost::php::webapp{$name:
ensure => $ensure,
@@ -76,7 +81,7 @@ define apache::vhost::php::mediawiki(
run_uid => $run_uid,
run_gid => $run_gid,
allow_override => $allow_override,
- php_settings => $php_settings,
+ php_settings => merge($mediawiki_php_settings,$php_settings),
php_options => $php_options,
options => $options,
additional_options => $additional_options,