diff options
| -rw-r--r-- | manifests/vhost.pp | 2 | ||||
| -rw-r--r-- | manifests/vhost/php/standard.pp | 5 | ||||
| -rw-r--r-- | manifests/vhost/template.pp | 1 | ||||
| -rw-r--r-- | templates/vhosts/php/CentOS.erb | 4 |
4 files changed, 10 insertions, 2 deletions
diff --git a/manifests/vhost.pp b/manifests/vhost.pp index c5215a0..f1b010b 100644 --- a/manifests/vhost.pp +++ b/manifests/vhost.pp @@ -19,6 +19,7 @@ define apache::vhost( $allow_override = 'None', $php_upload_tmp_dir = 'absent', $php_session_save_path = 'absent', + $php_use_smarty = false, $cgi_binpath = 'absent', $default_charset = 'absent', $do_includes = false, @@ -63,6 +64,7 @@ define apache::vhost( options => $options, additional_options => $additional_options, default_charset => $default_charset, + php_use_smarty => $php_use_smarty, run_mode => $run_mode, run_uid => $run_uid, run_gid => $run_gid, diff --git a/manifests/vhost/php/standard.pp b/manifests/vhost/php/standard.pp index fcca6cd..461c85a 100644 --- a/manifests/vhost/php/standard.pp +++ b/manifests/vhost/php/standard.pp @@ -24,6 +24,7 @@ define apache::vhost::php::standard( $allow_override = 'None', $php_upload_tmp_dir = 'absent', $php_session_save_path = 'absent', + $php_use_smarty = false, $do_includes = false, $options = 'absent', $additional_options = 'absent', @@ -48,6 +49,10 @@ define apache::vhost::php::standard( run_uid => $run_uid, } + if $php_use_smarty { + include php::extensions::smarty + } + if $manage_webdir { # create webdir ::apache::vhost::webdir{$name: diff --git a/manifests/vhost/template.pp b/manifests/vhost/template.pp index 07429a2..ccc4538 100644 --- a/manifests/vhost/template.pp +++ b/manifests/vhost/template.pp @@ -29,6 +29,7 @@ define apache::vhost::template( $options = 'absent', $additional_options = 'absent', $default_charset = 'absent', + $php_use_smarty = false, $run_mode = 'normal', $run_uid = 'absent', $run_gid = 'absent', diff --git a/templates/vhosts/php/CentOS.erb b/templates/vhosts/php/CentOS.erb index 5b444cd..13c497e 100644 --- a/templates/vhosts/php/CentOS.erb +++ b/templates/vhosts/php/CentOS.erb @@ -38,7 +38,7 @@ require valid-user <%- end -%> php_admin_flag engine on - php_admin_value open_basedir /usr/share/php/Smarty/:<%= documentroot %>:<%= real_php_upload_tmp_dir %>:<%= real_php_session_save_path %> + php_admin_value open_basedir <%- if php_use_smarty.to_s == 'true' -%>/usr/share/php/Smarty/:<%- end -%><%= 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> @@ -98,7 +98,7 @@ require valid-user <%- end -%> php_admin_flag engine on - php_admin_value open_basedir /usr/share/php/Smarty/:<%= documentroot %>:<%= real_php_upload_tmp_dir %>:<%= real_php_session_save_path %> + php_admin_value open_basedir <%- if php_use_smarty.to_s == 'true' -%>/usr/share/php/Smarty/:<%- end -%><%= 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> |