From: Tom Hughes Date: Sat, 22 Nov 2014 20:39:44 +0000 (+0000) Subject: Check for file existence properly X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/bc43d52769701bd9a6915c3687b50f320b48d91d Check for file existence properly --- diff --git a/cookbooks/dev/templates/default/apache.user.erb b/cookbooks/dev/templates/default/apache.user.erb index fd6be28be..2c2093599 100644 --- a/cookbooks/dev/templates/default/apache.user.erb +++ b/cookbooks/dev/templates/default/apache.user.erb @@ -19,12 +19,13 @@ 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 <%= @directory %>%{REQUEST_FILENAME} -f + RewriteCond %{LA-U:REQUEST_FILENAME} -f RewriteRule ^/cgi-bin/(.*)$ /cgi-bin/cgiwrap/~<%= @user %>/cgi-bin/$1 [PT,L] - RewriteCond <%= @directory %>%{REQUEST_FILENAME} -f + RewriteCond %{LA-U: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]