From e944403f922f0ae19e60747b60cbf2d999496312 Mon Sep 17 00:00:00 2001 From: Jerome Charaoui Date: Mon, 24 Feb 2014 13:24:44 -0500 Subject: remove safe_mode flag from defaults under Debian (removed from PHP 5.4 which is in wheezy) --- manifests/vhost/php/standard.pp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'manifests/vhost') 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" -- cgit v1.2.3 From 3e031fe7ca946580b8c94e9b77f855c054802cfb Mon Sep 17 00:00:00 2001 From: Jerome Charaoui Date: Mon, 24 Feb 2014 13:43:18 -0500 Subject: append to standard paths instead of override --- manifests/vhost/php/standard.pp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'manifests/vhost') diff --git a/manifests/vhost/php/standard.pp b/manifests/vhost/php/standard.pp index fa6b298..bdb290e 100644 --- a/manifests/vhost/php/standard.pp +++ b/manifests/vhost/php/standard.pp @@ -121,7 +121,10 @@ define apache::vhost::php::standard( engine => 'On', 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}", + open_basedir => has_key($php_settings,'open_basedir') ? { + true => "${smarty_path}${pear_path}${documentroot}:/var/www/upload_tmp_dir/${name}:/var/www/session.save_path/${name}:${php_settings[open_basedir]}", + false => "${smarty_path}${pear_path}${documentroot}:/var/www/upload_tmp_dir/${name}:/var/www/session.save_path/${name}", + }, safe_mode => $::operatingsystem ? { debian => undef, default => 'On', -- cgit v1.2.3 From 588dd5342e97e5a659d76aa59aa5d913a8181368 Mon Sep 17 00:00:00 2001 From: Jerome Charaoui Date: Mon, 24 Feb 2014 15:44:15 -0500 Subject: pass additional open_basedir paths in $php_options hash instead --- manifests/vhost/php/standard.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'manifests/vhost') diff --git a/manifests/vhost/php/standard.pp b/manifests/vhost/php/standard.pp index bdb290e..47ce64f 100644 --- a/manifests/vhost/php/standard.pp +++ b/manifests/vhost/php/standard.pp @@ -121,8 +121,8 @@ define apache::vhost::php::standard( engine => 'On', upload_tmp_dir => "/var/www/upload_tmp_dir/${name}", 'session.save_path' => "/var/www/session.save_path/${name}", - open_basedir => has_key($php_settings,'open_basedir') ? { - true => "${smarty_path}${pear_path}${documentroot}:/var/www/upload_tmp_dir/${name}:/var/www/session.save_path/${name}:${php_settings[open_basedir]}", + open_basedir => has_key($php_options,'additional_open_basedir') ? { + true => "${smarty_path}${pear_path}${documentroot}:/var/www/upload_tmp_dir/${name}:/var/www/session.save_path/${name}:${php_options[additional_open_basedir]}", false => "${smarty_path}${pear_path}${documentroot}:/var/www/upload_tmp_dir/${name}:/var/www/session.save_path/${name}", }, safe_mode => $::operatingsystem ? { -- cgit v1.2.3