X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/8e9e103e9f748fe7a104c4fba00cc72a847e2d3a..5c47d954b6d631cba545ba5793c11c1cc90e37ce:/cookbooks/tile/templates/default/apache.erb diff --git a/cookbooks/tile/templates/default/apache.erb b/cookbooks/tile/templates/default/apache.erb index 024c664be..4fcbf9b47 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 @@ -14,7 +16,7 @@ # Get the real remote IP for requests via a trusted proxy RemoteIPHeader X-Forwarded-For <% @caches.each do |cache| -%> -<% cache.ipaddresses(:role => :external) do |address| -%> +<% cache.ipaddresses(:role => :external).sort.each do |address| -%> RemoteIPTrustedProxy <%= address %> <% end -%> <% end -%> @@ -24,23 +26,35 @@ 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 "*" + + # Remove Proxy request header to mitigate https://httpoxy.org/ + RequestHeader unset Proxy early + # Enable the rewrite engine RewriteEngine on # Rewrite tile requests to the default style RewriteRule ^/(-?\d+)/(-?\d+)/(-?\d+)\.png$ /default/$1/$2/$3.png [PT,T=image/png,L] + RewriteRule ^/(-?\d+)/(-?\d+)/(-?\d+)\.png/status/?$ /default/$1/$2/$3.png/status [PT,T=text/plain,L] + RewriteRule ^/(-?\d+)/(-?\d+)/(-?\d+)\.png/dirty/?$ /default/$1/$2/$3.png/dirty [PT,T=text/plain,L] + + # Historical Files redirect + 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 - Order allow,deny - Allow from all + Require all granted Options ExecCGI AllowOverride None - Order allow,deny - Allow from all + Require all granted