diff options
| author | mh <mh@immerda.ch> | 2009-03-07 13:39:25 +0000 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2009-03-07 13:39:25 +0000 |
| commit | 529c818ece6a8073dc3b651b459655d2397a3409 (patch) | |
| tree | 7540818a24a3083ed3c7b151dbcc7eb291cee52f /manifests | |
| parent | 702cd7d93d1912b76584d49c581f00ca40d484c6 (diff) | |
fix upload und session php dir problem
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/defines/vhost_files.pp | 19 | ||||
| -rw-r--r-- | manifests/defines/vhost_varieties.pp | 8 |
2 files changed, 23 insertions, 4 deletions
diff --git a/manifests/defines/vhost_files.pp b/manifests/defines/vhost_files.pp index 3361eee..df38241 100644 --- a/manifests/defines/vhost_files.pp +++ b/manifests/defines/vhost_files.pp @@ -251,6 +251,25 @@ define apache::vhost::template( } } } + + # set default dirs for templates + # php upload_tmp_dir + case $upload_tmp_dir { + 'absent': { + include apache::defaultphpdirs + $real_upload_tmp_dir = "/var/www/upload_tmp_dir/$name" + } + default: { $real_upload_tmp_dir = $upload_tmp_dir } + } + # php session_save_path + case $session_save_path { + 'absent': { + include apache::defaultphpdirs + $real_session_save_path = "/var/www/session.save_path/$name" + } + default: { $real_session_save_path = $session_save_path } + } + apache::vhost::file{$name: ensure => $ensure, content => template("apache/vhosts/$template_mode/$operatingsystem.erb"), diff --git a/manifests/defines/vhost_varieties.pp b/manifests/defines/vhost_varieties.pp index a75f627..dd91dab 100644 --- a/manifests/defines/vhost_varieties.pp +++ b/manifests/defines/vhost_varieties.pp @@ -143,8 +143,8 @@ define apache::vhost::php::standard( options => $options, additional_options => $additional_options, default_charset => $default_charset, - php_upload_tmp_dir => $real_upload_tmp_dir, - php_session_save_path => $real_session_save_path, + php_upload_tmp_dir => $upload_tmp_dir, + php_session_save_path => $session_save_path, ssl_mode => $ssl_mode, htpasswd_file => $htpasswd_file, htpasswd_path => $htpasswd_path, @@ -268,8 +268,8 @@ define apache::vhost::php::joomla( options => $options, additional_options => $additional_options, default_charset => $default_charset, - php_upload_tmp_dir => $real_upload_tmp_dir, - php_session_save_path => $real_session_save_path, + php_upload_tmp_dir => $upload_tmp_dir, + php_session_save_path => $session_save_path, ssl_mode => $ssl_mode, htpasswd_file => $htpasswd_file, htpasswd_path => $htpasswd_path, |