diff options
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/vhost/php/standard.pp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/manifests/vhost/php/standard.pp b/manifests/vhost/php/standard.pp index 53fa8f9..47ce64f 100644 --- a/manifests/vhost/php/standard.pp +++ b/manifests/vhost/php/standard.pp @@ -121,8 +121,14 @@ 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}", - safe_mode => 'On', + 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 ? { + debian => undef, + default => 'On', + }, } if $logmode != 'nologs' { $std_php_settings[error_log] = "${logdir}/php_error_log" |