summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2014-02-24 13:24:44 -0500
committerroot <admin@cmaisonneuve.qc.ca>2014-02-24 13:24:44 -0500
commite944403f922f0ae19e60747b60cbf2d999496312 (patch)
tree1a8dc5cf41e71d59b1c523c11cb7fe9f97ef571e
parent1194d183efb1395b91c5433b2878f7908a24c78f (diff)
remove safe_mode flag from defaults under Debian (removed from PHP 5.4 which is in wheezy)
-rw-r--r--manifests/vhost/php/standard.pp5
1 files changed, 4 insertions, 1 deletions
diff --git a/manifests/vhost/php/standard.pp b/manifests/vhost/php/standard.pp
index 53fa8f9..fa6b298 100644
--- a/manifests/vhost/php/standard.pp
+++ b/manifests/vhost/php/standard.pp
@@ -122,7 +122,10 @@ define apache::vhost::php::standard(
upload_tmp_dir => "/var/www/upload_tmp_dir/${name}",
'session.save_path' => "/var/www/session.save_path/${name}",
open_basedir => "${smarty_path}${pear_path}${documentroot}:/var/www/upload_tmp_dir/${name}:/var/www/session.save_path/${name}",
- safe_mode => 'On',
+ safe_mode => $::operatingsystem ? {
+ debian => undef,
+ default => 'On',
+ },
}
if $logmode != 'nologs' {
$std_php_settings[error_log] = "${logdir}/php_error_log"