diff options
author | mh <mh@immerda.ch> | 2014-05-29 15:56:42 +0200 |
---|---|---|
committer | mh <mh@immerda.ch> | 2014-05-29 15:56:42 +0200 |
commit | a16d08298f46a0ff27e562b2b16ef3510e5c65e3 (patch) | |
tree | 17b2717f68f92c1867ebd974b48fe4a58876c07a /manifests/vhost/php | |
parent | e1a0f0d0b172c59ec707cbc9c94475c770a07385 (diff) |
take safe mode setting outside
Diffstat (limited to 'manifests/vhost/php')
-rw-r--r-- | manifests/vhost/php/standard.pp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/manifests/vhost/php/standard.pp b/manifests/vhost/php/standard.pp index 69e7db8..e0eb1e6 100644 --- a/manifests/vhost/php/standard.pp +++ b/manifests/vhost/php/standard.pp @@ -191,18 +191,19 @@ define apache::vhost::php::standard( $safe_mode_gid = undef } + $safe_mode = $::operatingsystem ? { + debian => undef, + default => $php_installation ? { + 'system' => 'On', + default => undef, + } + } $std_php_settings = { engine => 'On', upload_tmp_dir => "/var/www/upload_tmp_dir/${name}", 'session.save_path' => "/var/www/session.save_path/${name}", - safe_mode => $::operatingsystem ? { - debian => undef, - default => $php_installation ? { - 'system' => 'On', - default => undef, - } - }, error_log => $php_error_log, + safe_mode => $safe_mode, safe_mode_gid => $safe_mode_gid, safe_mode_exec_dir => $std_php_settings_safe_mode_exec_dir, default_charset => $std_php_settings_default_charset, |