diff options
| author | mh <mh@immerda.ch> | 2009-06-13 00:04:15 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2009-06-13 00:04:15 +0200 |
| commit | 3a92cae220d655c22d7bde865b597b5a92ac06d8 (patch) | |
| tree | 76f08ce761a119eaa2cd213e2aad2abc3ebfb4d6 | |
| parent | 7cd37266beea81f613c41260e8921eef956dbb1e (diff) | |
we can now also enable the usage of pear
| -rw-r--r-- | manifests/vhost.pp | 2 | ||||
| -rw-r--r-- | manifests/vhost/php/standard.pp | 3 | ||||
| -rw-r--r-- | manifests/vhost/template.pp | 1 | ||||
| -rw-r--r-- | templates/vhosts/php/CentOS.erb | 4 |
4 files changed, 8 insertions, 2 deletions
diff --git a/manifests/vhost.pp b/manifests/vhost.pp index f50ff33..0c7bf7a 100644 --- a/manifests/vhost.pp +++ b/manifests/vhost.pp @@ -21,6 +21,7 @@ define apache::vhost( $php_upload_tmp_dir = 'absent', $php_session_save_path = 'absent', $php_use_smarty = false, + $php_use_pear = false, $cgi_binpath = 'absent', $default_charset = 'absent', $do_includes = false, @@ -67,6 +68,7 @@ define apache::vhost( additional_options => $additional_options, default_charset => $default_charset, php_use_smarty => $php_use_smarty, + php_use_pear => $php_use_pear, 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 461c85a..d909c04 100644 --- a/manifests/vhost/php/standard.pp +++ b/manifests/vhost/php/standard.pp @@ -25,6 +25,7 @@ define apache::vhost::php::standard( $php_upload_tmp_dir = 'absent', $php_session_save_path = 'absent', $php_use_smarty = false, + $php_use_pear = false, $do_includes = false, $options = 'absent', $additional_options = 'absent', @@ -89,6 +90,8 @@ define apache::vhost::php::standard( default_charset => $default_charset, php_upload_tmp_dir => $php_upload_tmp_dir, php_session_save_path => $php_session_save_path, + php_use_smarty => $php_use_smarty, + php_use_pear => $php_use_pear, ssl_mode => $ssl_mode, htpasswd_file => $htpasswd_file, htpasswd_path => $htpasswd_path, diff --git a/manifests/vhost/template.pp b/manifests/vhost/template.pp index 228ec9d..26f5bd2 100644 --- a/manifests/vhost/template.pp +++ b/manifests/vhost/template.pp @@ -31,6 +31,7 @@ define apache::vhost::template( $additional_options = 'absent', $default_charset = 'absent', $php_use_smarty = false, + $php_use_pear = 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 13c497e..afba3ce 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 <%- 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 open_basedir <%- if php_use_smarty.to_s == 'true' -%>/usr/share/php/Smarty/:<%- end -%><%- if php_use_pear.to_s == 'true' -%>/usr/share/pear/:<%- 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 <%- 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 open_basedir <%- if php_use_smarty.to_s == 'true' -%>/usr/share/php/Smarty/:<%- end -%><%- if php_use_pear.to_s == 'true' -%>/usr/share/pear/:<%- 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> |