diff options
| author | mh <mh@immerda.ch> | 2014-04-19 19:09:16 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2014-04-19 19:09:16 +0200 |
| commit | 7a1c4171e81dd4550e403fc211b582d610e20671 (patch) | |
| tree | 1b2e7bfbd97a65ef170e65a61d13e44df8600694 /manifests | |
| parent | 3522b97b81e00f6a590cd930c2c69166d6140d43 (diff) | |
fix merge regression and add data-dir back to open_basedir
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/vhost/php/standard.pp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/manifests/vhost/php/standard.pp b/manifests/vhost/php/standard.pp index 242a47d..2d6d8cb 100644 --- a/manifests/vhost/php/standard.pp +++ b/manifests/vhost/php/standard.pp @@ -181,7 +181,6 @@ 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}:${real_path}/data:/var/www/upload_tmp_dir/${name}:/var/www/session.save_path/${name}", safe_mode => $::operatingsystem ? { debian => undef, default => 'On', @@ -191,8 +190,8 @@ define apache::vhost::php::standard( safe_mode_exec_dir => $std_php_settings_safe_mode_exec_dir, default_charset => $std_php_settings_default_charset, 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}", + true => "${smarty_path}${pear_path}${documentroot}:${real_path}/data:/var/www/upload_tmp_dir/${name}:/var/www/session.save_path/${name}:${php_options[additional_open_basedir]}", + false => "${smarty_path}${pear_path}${documentroot}:${real_path}/data:/var/www/upload_tmp_dir/${name}:/var/www/session.save_path/${name}", }, } |