X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/d25102f65d7659c8fc90144e05cfb35410f8eaf5..2f0b6f10a1269e4a0a3ae8897d6fda10dd14fb4d:/cookbooks/tile/templates/default/apache.erb

diff --git a/cookbooks/tile/templates/default/apache.erb b/cookbooks/tile/templates/default/apache.erb
index 499de564f..e6f8ade1c 100644
--- a/cookbooks/tile/templates/default/apache.erb
+++ b/cookbooks/tile/templates/default/apache.erb
@@ -2,7 +2,7 @@
 
 <VirtualHost *:443>
   # Basic server configuration
-  ServerName <%= node[:fqdn] %>
+  ServerName <%= node.name %>
   ServerAlias tile.openstreetmap.org
   ServerAlias render.openstreetmap.org
   ServerAdmin webmaster@openstreetmap.org
@@ -25,6 +25,9 @@
 <% cache.ipaddresses(:role => :external).sort.each do |address| -%>
   RemoteIPTrustedProxy <%= address %>
 <% end -%>
+<% end -%>
+<% @fastly.sort.each do |address| -%>
+  RemoteIPTrustedProxy <%= address %>
 <% end -%>
 
   # Setup logging
@@ -38,7 +41,10 @@
   Header set Access-Control-Allow-Origin "*"
 
   # Add diagnostics header to identify render server
-  Header set X-TileRender "<%= node[:hostname] %>"
+  Header set X-TileRender "<%= node.name %>"
+
+  # Tell clients to use stale tiles if necessary
+  Header append Cache-Control "stale-while-revalidate=604800, stale-if-error=604800" "expr=%{CONTENT_TYPE} == 'image/png'"
 
   # Remove Proxy request header to mitigate https://httpoxy.org/
   RequestHeader unset Proxy early
@@ -52,9 +58,9 @@
   RewriteRule ^/(\d+)/(\d+)/(\d+)\.png/dirty/?$   /default/$1/$2/$3.png/dirty  [PT,T=text/plain,L]
 
   # Historical Files redirect
-  RedirectPermanent /processed_p.tar.bz2 https://planet.openstreetmap.org/historical-shapefiles/processed_p.tar.bz2
-  RedirectPermanent /shoreline_300.tar.bz2 https://planet.openstreetmap.org/historical-shapefiles/shoreline_300.tar.bz2
-  RedirectPermanent /world_boundaries-spherical.tgz https://planet.openstreetmap.org/historical-shapefiles/world_boundaries-spherical.tgz
+  RedirectPermanent /processed_p.tar.bz2 https://planet.openstreetmap.org/historical-shapefiles/
+  RedirectPermanent /shoreline_300.tar.bz2 https://planet.openstreetmap.org/historical-shapefiles/
+  RedirectPermanent /world_boundaries-spherical.tgz https://planet.openstreetmap.org/historical-shapefiles/
 
   # Redirect ACME certificate challenges
   RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
@@ -62,7 +68,7 @@
 
 <VirtualHost *:80>
   # Basic server configuration
-  ServerName <%= node[:fqdn] %>
+  ServerName <%= node.name %>
   ServerAlias tile.openstreetmap.org
   ServerAlias render.openstreetmap.org
   ServerAdmin webmaster@openstreetmap.org
@@ -86,7 +92,7 @@
   Header set Access-Control-Allow-Origin "*"
 
   # Add diagnostics header to identify render server
-  Header set X-TileRender "<%= node[:hostname] %>"
+  Header set X-TileRender "<%= node.name %>"
 
   # Remove Proxy request header to mitigate https://httpoxy.org/
   RequestHeader unset Proxy early