From: Tom Hughes Date: Mon, 6 Jul 2015 21:40:57 +0000 (+0100) Subject: Switch back to the old way of checking file existence X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/55d4807f5762a97c2e655bc4eb5e449137bbe3e3 Switch back to the old way of checking file existence Something seems to have changed because the sub-request system no longer works, and the direct check is working again... --- diff --git a/cookbooks/dev/templates/default/apache.user.erb b/cookbooks/dev/templates/default/apache.user.erb index 2c2093599..fd6be28be 100644 --- a/cookbooks/dev/templates/default/apache.user.erb +++ b/cookbooks/dev/templates/default/apache.user.erb @@ -19,13 +19,12 @@ WSGIDaemonProcess <%= @user %>.dev.openstreetmap.org user=<%= @user %> inactivit CustomLog /var/log/apache2/<%= @user %>.dev.openstreetmap.org-access.log combined ErrorLog /var/log/apache2/<%= @user %>.dev.openstreetmap.org-error.log - RewriteCond %{LA-U:REQUEST_FILENAME} -f + RewriteCond <%= @directory %>%{REQUEST_FILENAME} -f RewriteRule ^/cgi-bin/(.*)$ /cgi-bin/cgiwrap/~<%= @user %>/cgi-bin/$1 [PT,L] - RewriteCond %{LA-U:REQUEST_FILENAME} -f + RewriteCond <%= @directory %>%{REQUEST_FILENAME} -f RewriteRule ^/cgi-bin-d/(.*)$ /cgi-bin/cgiwrapd/~<%= @user %>/cgi-bin/$1 [PT,L] - RewriteCond %{LA-U:REQUEST_FILENAME} -f RewriteRule ^/(.*\.ph(p|ps|p3|tml)(/.*)?)$ fcgi://127.0.0.1:<%= @port %><%= @directory %>/$1 [P]