Avoid cloning directory resources in the tile recipe

[chef.git] / cookbooks / tile / templates / default / apache.erb

diff --git a/cookbooks/tile/templates/default/apache.erb b/cookbooks/tile/templates/default/apache.erb
index 91a901e45337cc1fccdc8ac4b2e5c573dec39361..4fcbf9b478a16d66b08a8d4710d823fd7c7c385b 100644 (file)
--- a/cookbooks/tile/templates/default/apache.erb
+++ b/cookbooks/tile/templates/default/apache.erb
@@ -30,6 +30,9 @@
   # will always work and can be cached
   Header set Access-Control-Allow-Origin "*"
 
   # will always work and can be cached
   Header set Access-Control-Allow-Origin "*"
 

+  # Remove Proxy request header to mitigate https://httpoxy.org/
+  RequestHeader unset Proxy early
+

   # Enable the rewrite engine
   RewriteEngine on
 
   # Enable the rewrite engine
   RewriteEngine on
 


@@ -47,13 +50,11 @@
 <Directory /srv/tile.openstreetmap.org/html>
   Options None
   AllowOverride None
 <Directory /srv/tile.openstreetmap.org/html>
   Options None
   AllowOverride None

-  Order allow,deny
-  Allow from all
+  Require all granted

 </Directory>
 
 <Directory /srv/tile.openstreetmap.org/cgi-bin>
   Options ExecCGI
   AllowOverride None
 </Directory>
 
 <Directory /srv/tile.openstreetmap.org/cgi-bin>
   Options ExecCGI
   AllowOverride None

-  Order allow,deny
-  Allow from all
+  Require all granted

 </Directory>
 </Directory>