diff options
| author | mh <mh@immerda.ch> | 2014-05-26 07:48:11 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2014-05-26 07:48:11 +0200 |
| commit | e1a0f0d0b172c59ec707cbc9c94475c770a07385 (patch) | |
| tree | e1cd1bd4ec9a0c25fe7514a2ea9f556639cb1967 /manifests | |
| parent | 0bbe37a35fe98d67c2c25989d9585e31e42dc3c0 (diff) | |
on newer installations (php >= 5.4) we should not use safe_mode things
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/vhost/php/standard.pp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/manifests/vhost/php/standard.pp b/manifests/vhost/php/standard.pp index 8498a82..69e7db8 100644 --- a/manifests/vhost/php/standard.pp +++ b/manifests/vhost/php/standard.pp @@ -122,11 +122,6 @@ define apache::vhost::php::standard( } else { $php_error_log = undef } - if $run_mode == 'fcgid' { - $safe_mode_gid = 'On' - } else { - $safe_mode_gid = undef - } if ('safe_mode_exec_dir' in $php_settings) { $php_safe_mode_exec_dir = $php_settings[safe_mode_exec_dir] @@ -184,6 +179,18 @@ define apache::vhost::php::standard( $the_open_basedir = "${smarty_path}${pear_path}${documentroot}:${real_path}/data:/var/www/upload_tmp_dir/${name}:/var/www/session.save_path/${name}" } + if $run_mode == 'fcgid' { + $safe_mode_gid = $::operatingsystem ? { + debian => undef, + default => $php_installation ? { + 'system' => 'On', + default => undef, + } + } + } else { + $safe_mode_gid = undef + } + $std_php_settings = { engine => 'On', upload_tmp_dir => "/var/www/upload_tmp_dir/${name}", |