Added Luxembourg 2019 lidar hillshade

[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 499de564fcb154a79626cff8994ac1b3477efd43..182b590e516d7c7883ad0c24306747f4ce2917c5 100644 (file)
--- a/cookbooks/tile/templates/default/apache.erb
+++ b/cookbooks/tile/templates/default/apache.erb
@@ -2,7 +2,7 @@
 
 <VirtualHost *:443>
   # Basic server configuration
 
 <VirtualHost *:443>
   # Basic server configuration

-  ServerName <%= node[:fqdn] %>
+  ServerName <%= node.name %>

   ServerAlias tile.openstreetmap.org
   ServerAlias render.openstreetmap.org
   ServerAdmin webmaster@openstreetmap.org
   ServerAlias tile.openstreetmap.org
   ServerAlias render.openstreetmap.org
   ServerAdmin webmaster@openstreetmap.org


@@ -38,7 +38,10 @@
   Header set Access-Control-Allow-Origin "*"
 
   # Add diagnostics header to identify render server
   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
 
   # Remove Proxy request header to mitigate https://httpoxy.org/
   RequestHeader unset Proxy early


@@ -62,7 +65,7 @@
 
 <VirtualHost *:80>
   # Basic server configuration
 
 <VirtualHost *:80>
   # Basic server configuration

-  ServerName <%= node[:fqdn] %>
+  ServerName <%= node.name %>

   ServerAlias tile.openstreetmap.org
   ServerAlias render.openstreetmap.org
   ServerAdmin webmaster@openstreetmap.org
   ServerAlias tile.openstreetmap.org
   ServerAlias render.openstreetmap.org
   ServerAdmin webmaster@openstreetmap.org


@@ -86,7 +89,7 @@
   Header set Access-Control-Allow-Origin "*"
 
   # Add diagnostics header to identify render server
   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
 
   # Remove Proxy request header to mitigate https://httpoxy.org/
   RequestHeader unset Proxy early