X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/879534787f4a168f9578d1336097943da9e9f538..4bfd3b66e6fc725fb406068a955bb3aeea394f90:/cookbooks/tile/templates/default/apache.erb?ds=sidebyside diff --git a/cookbooks/tile/templates/default/apache.erb b/cookbooks/tile/templates/default/apache.erb index 95ec5d11b..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,6 +26,10 @@ 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 @@ -36,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 - Options None AllowOverride None +<% if node[:lsb][:release].to_f >= 14.04 -%> + Require all granted +<% else -%> Order allow,deny Allow from all +<% end -%> Options ExecCGI AllowOverride None +<% if node[:lsb][:release].to_f >= 14.04 -%> + Require all granted +<% else -%> Order allow,deny Allow from all +<% end -%>