diff options
| author | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2014-02-24 15:44:15 -0500 |
|---|---|---|
| committer | root <admin@cmaisonneuve.qc.ca> | 2014-02-24 15:51:39 -0500 |
| commit | 588dd5342e97e5a659d76aa59aa5d913a8181368 (patch) | |
| tree | 7be2b68bad2d007dc8f40916e92a96a8eba61232 /manifests | |
| parent | 3e031fe7ca946580b8c94e9b77f855c054802cfb (diff) | |
pass additional open_basedir paths in $php_options hash instead
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/vhost/php/standard.pp | 4 |
1 files changed, 2 insertions, 2 deletions
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 ? { |