diff options
| author | o <o@immerda.ch> | 2013-09-12 20:59:22 +0200 |
|---|---|---|
| committer | o <o@immerda.ch> | 2013-09-12 20:59:22 +0200 |
| commit | 76ded9761da817a5d72e14a23b49582c1127aacd (patch) | |
| tree | f2068e91b0c0b1a6b4a5d22318bcc5774c40f3f1 /manifests | |
| parent | cb5fc23d113fc0e383f6d891399b4385eb952cf3 (diff) | |
remove the variable again
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/vhost/php/standard.pp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/manifests/vhost/php/standard.pp b/manifests/vhost/php/standard.pp index f724580..3c98a8a 100644 --- a/manifests/vhost/php/standard.pp +++ b/manifests/vhost/php/standard.pp @@ -122,8 +122,7 @@ define apache::vhost::php::standard( 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}:/var/www/upload_tmp_dir/${name}:/var/www/session.save_path/${name}", - safe_mode => 'On', - php_tmp_dir => false, + safe_mode => 'On' } if $logmode != 'nologs' { $std_php_settings[error_log] = "${logdir}/php_error_log" @@ -191,12 +190,12 @@ define apache::vhost::php::standard( include apache::include::mod_fcgid mod_fcgid::starter {$name: + php_tmp_dir => $real_php_settings[php_tmp_dir], cgi_type => 'php', - cgi_type_options => $real_php_settings, + cgi_type_options => delete($real_php_settings, php_tmp_dir), owner => $run_uid, group => $run_gid, notify => Service['apache'], - php_tmp_dir => $real_php_settings[php_tmp_dir] } } default: { include ::php } |