diff options
| -rw-r--r-- | manifests/defines/vhost_files.pp | 19 | ||||
| -rw-r--r-- | manifests/defines/vhost_varieties.pp | 8 | ||||
| -rw-r--r-- | templates/vhosts/php/CentOS.erb | 12 |
3 files changed, 29 insertions, 10 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, diff --git a/templates/vhosts/php/CentOS.erb b/templates/vhosts/php/CentOS.erb index e3dc7fa..30a6d72 100644 --- a/templates/vhosts/php/CentOS.erb +++ b/templates/vhosts/php/CentOS.erb @@ -35,9 +35,9 @@ require valid-user <%- end -%> php_admin_flag engine on - php_admin_value open_basedir <%= documentroot %>:<%= php_upload_tmp_dir %>:<%= php_session_save_path %> - php_admin_value upload_tmp_dir <%= php_upload_tmp_dir %> - php_admin_value session.save_path <%= php_session_save_path %> + php_admin_value open_basedir <%= documentroot %>:<%= real_php_upload_tmp_dir %>:<%= real_php_session_save_path %> + php_admin_value upload_tmp_dir <%= real_php_upload_tmp_dir %> + php_admin_value session.save_path <%= real_php_session_save_path %> </Directory> <%- end -%> @@ -90,9 +90,9 @@ require valid-user <%- end -%> php_admin_flag engine on - php_admin_value open_basedir <%= documentroot %>:<%= php_upload_tmp_dir %>:<%= php_session_save_path %> - php_admin_value upload_tmp_dir <%= php_upload_tmp_dir %> - php_admin_value session.save_path <%= php_session_save_path %> + php_admin_value open_basedir <%= documentroot %>:<%= real_php_upload_tmp_dir %>:<%= real_php_session_save_path %> + php_admin_value upload_tmp_dir <%= real_php_upload_tmp_dir %> + php_admin_value session.save_path <%= real_php_session_save_path %> </Directory> <IfModule mod_security2.c> |