From: Tom Hughes Date: Thu, 13 Nov 2014 09:28:08 +0000 (+0000) Subject: Only pass PHP files which exist to PHP-FPM X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/9dac151074e9eb87d97b59a0c7d5f2218078ed1f Only pass PHP files which exist to PHP-FPM --- diff --git a/cookbooks/dev/templates/default/apache.user.erb b/cookbooks/dev/templates/default/apache.user.erb index f31ed4f61..11955a0bd 100644 --- a/cookbooks/dev/templates/default/apache.user.erb +++ b/cookbooks/dev/templates/default/apache.user.erb @@ -14,8 +14,7 @@ WSGIDaemonProcess <%= @user %>.dev.openstreetmap.org user=<%= @user %> inactivit WSGIProcessGroup <%= @user %>.dev.openstreetmap.org RewriteEngine on - #RewriteLog /var/log/apache2/rewrite.log - #RewriteLogLevel 4 + #LogLevel rewrite:trace2 CustomLog /var/log/apache2/<%= @user %>.dev.openstreetmap.org-access.log combined ErrorLog /var/log/apache2/<%= @user %>.dev.openstreetmap.org-error.log @@ -26,7 +25,8 @@ WSGIDaemonProcess <%= @user %>.dev.openstreetmap.org user=<%= @user %> inactivit RewriteCond <%= @directory %>%{REQUEST_FILENAME} -f RewriteRule ^/cgi-bin-d/(.*)$ /cgi-bin/cgiwrapd/~<%= @user %>/cgi-bin/$1 [PT,L] - ProxyPassMatch ^/(.*\.ph(p|ps|p3|tml)(/.*)?)$ fcgi://127.0.0.1:<%= @port %><%= @directory %>/$1 + RewriteCond <%= @directory %>%{REQUEST_FILENAME} -f + RewriteRule ^/(.*\.ph(p|ps|p3|tml)(/.*)?)$ fcgi://127.0.0.1:<%= @port %><%= @directory %>/$1 [P] >