Switch to the Mapbox OSM instance

[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 9199cb3a9e64412174f3b22fbf9e36ef3c60ce82..24b87902bca4ca8845e64767fe71186d2454c388 100644 (file)
--- a/cookbooks/tile/templates/default/apache.erb
+++ b/cookbooks/tile/templates/default/apache.erb
@@ -26,6 +26,10 @@
   ErrorLog /var/log/apache2/error.log
   BufferedLogs on
 
   ErrorLog /var/log/apache2/error.log
   BufferedLogs on
 

+  # Always set Access-Control-Allow-Origin so that simple CORS requests
+  # will always work and can be cached
+  Header set Access-Control-Allow-Origin "*"
+

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


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

+<% if node[:lsb][:release].to_f >= 14.04 -%>
+  Require all granted
+<% else -%>

   Order allow,deny
   Allow from all
   Order allow,deny
   Allow from all

+<% end -%>

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

+<% if node[:lsb][:release].to_f >= 14.04 -%>
+  Require all granted
+<% else -%>

   Order allow,deny
   Allow from all
   Order allow,deny
   Allow from all

+<% end -%>

 </Directory>
 </Directory>