diff options
| author | mh <mh@immerda.ch> | 2010-06-12 10:10:08 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2010-06-12 10:10:08 +0200 |
| commit | e132dc759f455c8e8fb390e12961761d8e0a0429 (patch) | |
| tree | 18ae18441d96370aa191a2f914f56983e6ce834f /templates | |
| parent | 5c7054c2383d00232eaba8128af8ec6454865f41 (diff) | |
add upload_dir to open_base_dir if there is one
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/vhosts/php_gallery2/php_gallery.erb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/vhosts/php_gallery2/php_gallery.erb b/templates/vhosts/php_gallery2/php_gallery.erb index 522b53c..644c72a 100644 --- a/templates/vhosts/php_gallery2/php_gallery.erb +++ b/templates/vhosts/php_gallery2/php_gallery.erb @@ -44,7 +44,7 @@ <%- unless php_default_charset.to_s == 'absent' then -%> php_admin_value default_charset <%= php_default_charset %> <%- end -%> - php_admin_value open_basedir <%= documentroot %>:<%= real_php_upload_tmp_dir %>:<%= real_php_session_save_path %>:<%= gdatadir %> + php_admin_value open_basedir <%= documentroot %>:<%= real_php_upload_tmp_dir %>:<%= real_php_session_save_path %>:<%= gdatadir %><%= ":#{real_upload_dir.to_s}" if upload_dir.to_s != 'absent' %> php_admin_value upload_tmp_dir <%= real_php_upload_tmp_dir %> php_admin_value session.save_path <%= real_php_session_save_path %> <%- unless php_safe_mode_exec_bins.to_s == 'absent' then -%> @@ -128,7 +128,7 @@ <%- unless php_default_charset.to_s == 'absent' then -%> php_admin_value default_charset <%= php_default_charset %> <%- end -%> - php_admin_value open_basedir <%= documentroot %>:<%= real_php_upload_tmp_dir %>:<%= real_php_session_save_path %>:<%= gdatadir %> + php_admin_value open_basedir <%= documentroot %>:<%= real_php_upload_tmp_dir %>:<%= real_php_session_save_path %>:<%= gdatadir %><%= ":#{real_upload_dir.to_s}" if upload_dir.to_s != 'absent' %> php_admin_value upload_tmp_dir <%= real_php_upload_tmp_dir %> php_admin_value session.save_path <%= real_php_session_save_path %> <%- unless php_safe_mode_exec_bins.to_s == 'absent' then -%> |