diff options
| author | mh <mh@immerda.ch> | 2009-07-25 13:14:09 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2009-07-25 13:14:09 +0200 |
| commit | 7d1fe3693a106ead679584c52b0eaa6611847d25 (patch) | |
| tree | 9b9ff39b75fc61a5aa6d8b6aea4187dfb09b62fa | |
| parent | 5112b0a8ccc83e1b3dc44b55bac5444d7c125877 (diff) | |
add variable to tweak php safe_mode
| -rw-r--r-- | manifests/vhost.pp | 2 | ||||
| -rw-r--r-- | manifests/vhost/php/standard.pp | 2 | ||||
| -rw-r--r-- | manifests/vhost/template.pp | 1 | ||||
| -rw-r--r-- | templates/vhosts/php/CentOS.erb | 6 |
4 files changed, 11 insertions, 0 deletions
diff --git a/manifests/vhost.pp b/manifests/vhost.pp index cef7fc0..0f12ece 100644 --- a/manifests/vhost.pp +++ b/manifests/vhost.pp @@ -22,6 +22,7 @@ define apache::vhost( $php_session_save_path = 'absent', $php_use_smarty = false, $php_use_pear = false, + $php_safe_mode = true, $cgi_binpath = 'absent', $default_charset = 'absent', $do_includes = false, @@ -71,6 +72,7 @@ define apache::vhost( default_charset => $default_charset, php_use_smarty => $php_use_smarty, php_use_pear => $php_use_pear, + php_safe_mode => $php_safe_mode, 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 80840f4..2518962 100644 --- a/manifests/vhost/php/standard.pp +++ b/manifests/vhost/php/standard.pp @@ -26,6 +26,7 @@ define apache::vhost::php::standard( $php_session_save_path = 'absent', $php_use_smarty = false, $php_use_pear = false, + $php_safe_mode = true, $do_includes = false, $options = 'absent', $additional_options = 'absent', @@ -93,6 +94,7 @@ define apache::vhost::php::standard( php_session_save_path => $php_session_save_path, php_use_smarty => $php_use_smarty, php_use_pear => $php_use_pear, + php_safe_mode => $php_safe_mode, 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 b8a5c4c..d6881b0 100644 --- a/manifests/vhost/template.pp +++ b/manifests/vhost/template.pp @@ -33,6 +33,7 @@ define apache::vhost::template( $default_charset = 'absent', $php_use_smarty = false, $php_use_pear = false, + $php_safe_mode = true, $run_mode = 'normal', $run_uid = 'absent', $run_gid = 'absent', diff --git a/templates/vhosts/php/CentOS.erb b/templates/vhosts/php/CentOS.erb index 57af260..917e66c 100644 --- a/templates/vhosts/php/CentOS.erb +++ b/templates/vhosts/php/CentOS.erb @@ -39,6 +39,9 @@ require valid-user <%- end -%> php_admin_flag engine on + <%- if php_safe_mode.to_s == 'false' %> + php_admin_flag safe_mode Off + <%- end %> 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 %> @@ -102,6 +105,9 @@ require valid-user <%- end -%> php_admin_flag engine on + <%- if php_safe_mode.to_s == 'false' %> + php_admin_flag safe_mode Off + <%- end %> 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 %> |