X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/9dac151074e9eb87d97b59a0c7d5f2218078ed1f..13d93b0c9ef6c839d0ee550ded6e845a4a827fc9:/cookbooks/dev/templates/default/apache.user.erb diff --git a/cookbooks/dev/templates/default/apache.user.erb b/cookbooks/dev/templates/default/apache.user.erb index 11955a0bd..37ba4e460 100644 --- a/cookbooks/dev/templates/default/apache.user.erb +++ b/cookbooks/dev/templates/default/apache.user.erb @@ -7,6 +7,9 @@ WSGIDaemonProcess <%= @user %>.dev.openstreetmap.org user=<%= @user %> inactivit ServerAdmin webmaster@openstreetmap.org ServerAlias <%= @user %>.dev.osm.org + # Remove Proxy request header to mitigate https://httpoxy.org/ + RequestHeader unset Proxy early + UseCanonicalName Off DocumentRoot <%= @directory %> ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/ @@ -25,7 +28,7 @@ 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] - RewriteCond <%= @directory %>%{REQUEST_FILENAME} -f + RewriteCond <%= @directory %>%{REQUEST_FILENAME} -f RewriteRule ^/(.*\.ph(p|ps|p3|tml)(/.*)?)$ fcgi://127.0.0.1:<%= @port %><%= @directory %>/$1 [P]