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(-) 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