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 4fdb67b8d9f9093e78415aa4deb503f62ac6d7dd..4fcbf9b478a16d66b08a8d4710d823fd7c7c385b 100644 (file)
--- a/cookbooks/tile/templates/default/apache.erb
+++ b/cookbooks/tile/templates/default/apache.erb
@@ -26,9 +26,13 @@
   ErrorLog /var/log/apache2/error.log
   BufferedLogs on
 
-  # Set Access-Control-Allow-Origin header to allow Cross-origin resource sharing (CORS)
+  # Always set Access-Control-Allow-Origin so that simple CORS requests
+  # 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
 
@@ -46,13 +50,11 @@
 <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
-  Order allow,deny
-  Allow from all
+  Require all granted
 </Directory>