X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/5d066a8a35324c0291594563e8413fc11fd71456..01e4f572782563692eb2628d322cc6eb3eb19c59:/cookbooks/tile/templates/default/apache.erb

diff --git a/cookbooks/tile/templates/default/apache.erb b/cookbooks/tile/templates/default/apache.erb
index ac4ba8f12..24b87902b 100644
--- a/cookbooks/tile/templates/default/apache.erb
+++ b/cookbooks/tile/templates/default/apache.erb
@@ -4,6 +4,8 @@
   # Basic server configuration
   ServerName <%= node[:fqdn] %>
   ServerAlias tile.openstreetmap.org
+  ServerAlias render.openstreetmap.org
+  ServerAlias *.render.openstreetmap.org
   ServerAlias parent.tile.openstreetmap.org
   ServerAdmin webmaster@openstreetmap.org
 
@@ -24,7 +26,8 @@
   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 "*"
 
   # Enable the rewrite engine
@@ -39,19 +42,26 @@
   Redirect /processed_p.tar.bz2 http://planet.openstreetmap.org/historical-shapefiles/processed_p.tar.bz2
   Redirect /shoreline_300.tar.bz2 http://planet.openstreetmap.org/historical-shapefiles/shoreline_300.tar.bz2
   Redirect /world_boundaries-spherical.tgz http://planet.openstreetmap.org/historical-shapefiles/world_boundaries-spherical.tgz
-
 </VirtualHost>
 
 <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
+<% end -%>
 </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
+<% end -%>
 </Directory>