diff options
author | mh <mh@immerda.ch> | 2009-11-21 14:52:44 +0100 |
---|---|---|
committer | mh <mh@immerda.ch> | 2009-11-21 14:52:44 +0100 |
commit | 5333586e3b577fe70ddb73ab53a7220ad09d8b6a (patch) | |
tree | 31254a2b3bfb06b5cda56deffd248de9e631f0ad /templates | |
parent | f24f553a2a32b9bbeaddfe53bc30846e2f161031 (diff) |
purge bin dir, only add php option if we actually added binaries
Diffstat (limited to 'templates')
-rw-r--r-- | templates/vhosts/php/CentOS.erb | 4 | ||||
-rw-r--r-- | templates/vhosts/php_drupal/CentOS.erb | 4 | ||||
-rw-r--r-- | templates/vhosts/php_joomla/CentOS.erb | 4 | ||||
-rw-r--r-- | templates/vhosts/php_spip/CentOS.erb | 4 | ||||
-rw-r--r-- | templates/vhosts/php_typo3/CentOS.erb | 4 | ||||
-rw-r--r-- | templates/vhosts/php_wordpress/CentOS.erb | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/templates/vhosts/php/CentOS.erb b/templates/vhosts/php/CentOS.erb index ef7df55..84e5c26 100644 --- a/templates/vhosts/php/CentOS.erb +++ b/templates/vhosts/php/CentOS.erb @@ -48,7 +48,7 @@ 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 -%> + <%- unless php_safe_mode_exec_bins.to_s == 'absent' then -%> php_admin_value safe_mode_exec_dir <%= real_php_safe_mode_exec_bin_dir %> <%- end -%> </Directory> @@ -120,7 +120,7 @@ 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 -%> + <%- unless php_safe_mode_exec_bins.to_s == 'absent' then -%> php_admin_value safe_mode_exec_dir <%= real_php_safe_mode_exec_bin_dir %> <%- end -%> </Directory> diff --git a/templates/vhosts/php_drupal/CentOS.erb b/templates/vhosts/php_drupal/CentOS.erb index 995bb7e..6c106ce 100644 --- a/templates/vhosts/php_drupal/CentOS.erb +++ b/templates/vhosts/php_drupal/CentOS.erb @@ -45,7 +45,7 @@ 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 %> - <%- unless real_php_safe_mode_exec_bin_dir.to_s == 'absent' then -%> + <%- unless php_safe_mode_exec_bins.to_s == 'absent' then -%> php_admin_value safe_mode_exec_dir <%= real_php_safe_mode_exec_bin_dir %> <%- end -%> @@ -139,7 +139,7 @@ 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 %> - <%- unless real_php_safe_mode_exec_bin_dir.to_s == 'absent' then -%> + <%- unless php_safe_mode_exec_bins.to_s == 'absent' then -%> php_admin_value safe_mode_exec_dir <%= real_php_safe_mode_exec_bin_dir %> <%- end -%> diff --git a/templates/vhosts/php_joomla/CentOS.erb b/templates/vhosts/php_joomla/CentOS.erb index 5107a59..a5f0d13 100644 --- a/templates/vhosts/php_joomla/CentOS.erb +++ b/templates/vhosts/php_joomla/CentOS.erb @@ -47,7 +47,7 @@ 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 %> - <%- unless real_php_safe_mode_exec_bin_dir.to_s == 'absent' then -%> + <%- unless php_safe_mode_exec_bins.to_s == 'absent' then -%> php_admin_value safe_mode_exec_dir <%= real_php_safe_mode_exec_bin_dir %> <%- end -%> </Directory> @@ -142,7 +142,7 @@ 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 %> - <%- unless real_php_safe_mode_exec_bin_dir.to_s == 'absent' then -%> + <%- unless php_safe_mode_exec_bins.to_s == 'absent' then -%> php_admin_value safe_mode_exec_dir <%= real_php_safe_mode_exec_bin_dir %> <%- end -%> </Directory> diff --git a/templates/vhosts/php_spip/CentOS.erb b/templates/vhosts/php_spip/CentOS.erb index ef7df55..84e5c26 100644 --- a/templates/vhosts/php_spip/CentOS.erb +++ b/templates/vhosts/php_spip/CentOS.erb @@ -48,7 +48,7 @@ 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 -%> + <%- unless php_safe_mode_exec_bins.to_s == 'absent' then -%> php_admin_value safe_mode_exec_dir <%= real_php_safe_mode_exec_bin_dir %> <%- end -%> </Directory> @@ -120,7 +120,7 @@ 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 -%> + <%- unless php_safe_mode_exec_bins.to_s == 'absent' then -%> php_admin_value safe_mode_exec_dir <%= real_php_safe_mode_exec_bin_dir %> <%- end -%> </Directory> diff --git a/templates/vhosts/php_typo3/CentOS.erb b/templates/vhosts/php_typo3/CentOS.erb index 1b244f3..75182e1 100644 --- a/templates/vhosts/php_typo3/CentOS.erb +++ b/templates/vhosts/php_typo3/CentOS.erb @@ -47,7 +47,7 @@ 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 %> - <%- unless real_php_safe_mode_exec_bin_dir.to_s == 'absent' then -%> + <%- unless php_safe_mode_exec_bins.to_s == 'absent' then -%> php_admin_value safe_mode_exec_dir <%= real_php_safe_mode_exec_bin_dir %> <%- end -%> </Directory> @@ -131,7 +131,7 @@ 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 %> - <%- unless real_php_safe_mode_exec_bin_dir.to_s == 'absent' then -%> + <%- unless php_safe_mode_exec_bins.to_s == 'absent' then -%> php_admin_value safe_mode_exec_dir <%= real_php_safe_mode_exec_bin_dir %> <%- end -%> # turn allow_url_fopen on for the extension manager fetch diff --git a/templates/vhosts/php_wordpress/CentOS.erb b/templates/vhosts/php_wordpress/CentOS.erb index 59b4e20..83f9f4b 100644 --- a/templates/vhosts/php_wordpress/CentOS.erb +++ b/templates/vhosts/php_wordpress/CentOS.erb @@ -45,7 +45,7 @@ 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 %> - <%- unless real_php_safe_mode_exec_bin_dir.to_s == 'absent' then -%> + <%- unless php_safe_mode_exec_bins.to_s == 'absent' then -%> php_admin_value safe_mode_exec_dir <%= real_php_safe_mode_exec_bin_dir %> <%- end -%> </Directory> @@ -116,7 +116,7 @@ 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 %> - <%- unless real_php_safe_mode_exec_bin_dir.to_s == 'absent' then -%> + <%- unless php_safe_mode_exec_bins.to_s == 'absent' then -%> php_admin_value safe_mode_exec_dir <%= real_php_safe_mode_exec_bin_dir %> <%- end -%> </Directory> |