summaryrefslogtreecommitdiff
path: root/manifests/vhost
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/vhost')
-rw-r--r--manifests/vhost/php/standard.pp17
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}",