Disable cgiwrap support on errol

[chef.git] / 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 fd6be28be5ac18a7bcbc980d997357e7a8b5f492..a63829afb156227f0a05dbf4076fe9f2d09b18dd 100644 (file)
--- 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/
@@ -19,12 +22,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
-       RewriteRule ^/cgi-bin/(.*)$ /cgi-bin/cgiwrap/~<%= @user %>/cgi-bin/$1 [PT,L]
+#      RewriteCond <%= @directory %>%{REQUEST_FILENAME} -f
+#      RewriteRule ^/cgi-bin/(.*)$ /cgi-bin/cgiwrap/~<%= @user %>/cgi-bin/$1 [PT,L]
 
-       RewriteCond <%= @directory %>%{REQUEST_FILENAME} -f
-       RewriteRule ^/cgi-bin-d/(.*)$ /cgi-bin/cgiwrapd/~<%= @user %>/cgi-bin/$1 [PT,L]
+#      RewriteCond <%= @directory %>%{REQUEST_FILENAME} -f
+#      RewriteRule ^/cgi-bin-d/(.*)$ /cgi-bin/cgiwrapd/~<%= @user %>/cgi-bin/$1 [PT,L]
 
+        RewriteCond <%= @directory %>%{REQUEST_FILENAME} -f
        RewriteRule ^/(.*\.ph(p|ps|p3|tml)(/.*)?)$ fcgi://127.0.0.1:<%= @port %><%= @directory %>/$1 [P]
 </VirtualHost>