diff options
| author | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2014-02-24 13:43:18 -0500 |
|---|---|---|
| committer | root <admin@cmaisonneuve.qc.ca> | 2014-02-24 13:43:18 -0500 |
| commit | 3e031fe7ca946580b8c94e9b77f855c054802cfb (patch) | |
| tree | 8e1c6c010acf135719dc7fd3255e57b8b84c9f03 | |
| parent | e944403f922f0ae19e60747b60cbf2d999496312 (diff) | |
append to standard paths instead of override
| -rw-r--r-- | manifests/vhost/php/standard.pp | 5 |
1 files changed, 4 insertions, 1 deletions
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', |