diff options
| author | Andreas <andreas@immerda.ch> | 2009-11-19 15:52:32 +0100 |
|---|---|---|
| committer | Andreas <andreas@immerda.ch> | 2009-11-19 15:52:32 +0100 |
| commit | d0260e4bd1fab534843db554d9a097bb80b74066 (patch) | |
| tree | b348f62076a3bdcac65ad0834b2189b970a14930 /templates/vhosts/php_spip | |
| parent | 865f34c201d8dfa78c80111989fce423b4329b2d (diff) | |
| parent | 2d59d75a97eb08c5edf80bb52338c3a03e3a62a4 (diff) | |
Merge branch 'master' of ipuppet@git.puppet.immerda.ch:module-apache
Diffstat (limited to 'templates/vhosts/php_spip')
| -rw-r--r-- | templates/vhosts/php_spip/CentOS.erb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/templates/vhosts/php_spip/CentOS.erb b/templates/vhosts/php_spip/CentOS.erb index bf15796..4f54aaa 100644 --- a/templates/vhosts/php_spip/CentOS.erb +++ b/templates/vhosts/php_spip/CentOS.erb @@ -45,6 +45,9 @@ 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 %> + <%- unless real_php_safe_mode_exec_bin_dir.to_s == 'absent' then -%> + php_admin_value safe_mode_exec_dir <%= real_php_safe_mode_exec_bin_dir %> + <%- end -%> </Directory> <%- end -%> @@ -111,6 +114,9 @@ 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 %> + <%- unless real_php_safe_mode_exec_bin_dir.to_s == 'absent' then -%> + php_admin_value safe_mode_exec_dir <%= real_php_safe_mode_exec_bin_dir %> + <%- end -%> </Directory> <IfModule mod_security2.c> |