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