tile: Add diagnostics X-TileRender header

[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 ef4ee9f147e512665da88be25b7207055724e4ed..52c4ef91bc5f6f05a630f4be9e11b1567578051f 100644 (file)
--- a/cookbooks/tile/templates/default/apache.erb
+++ b/cookbooks/tile/templates/default/apache.erb
@@ -37,6 +37,9 @@
   # will always work and can be cached
   Header set Access-Control-Allow-Origin "*"
 
   # will always work and can be cached
   Header set Access-Control-Allow-Origin "*"
 

+  # Add diagnostics header to identify render server
+  Header set X-TileRender "<%= node[:hostname] %>"
+

   # 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
 


@@ -82,6 +85,9 @@
   # will always work and can be cached
   Header set Access-Control-Allow-Origin "*"
 
   # will always work and can be cached
   Header set Access-Control-Allow-Origin "*"
 

+  # Add diagnostics header to identify render server
+  Header set X-TileRender "<%= node[:hostname] %>"
+

   # 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
 


@@ -92,6 +98,8 @@
   RewriteRule ^/\.well-known/acme-challenge/(.*)$ http://acme.openstreetmap.org/.well-known/acme-challenge/$1 [R=permanent,L]
 
   # Redirect to https
   RewriteRule ^/\.well-known/acme-challenge/(.*)$ http://acme.openstreetmap.org/.well-known/acme-challenge/$1 [R=permanent,L]
 
   # Redirect to https

+  RewriteCond %{REQUEST_URI} !^/server-status$
+  RewriteCond %{REQUEST_URI} !^/mod_tile$

   RewriteRule (.*) https://%{SERVER_NAME}/$1 [R=permanent,L]
 </VirtualHost>
 
   RewriteRule (.*) https://%{SERVER_NAME}/$1 [R=permanent,L]
 </VirtualHost>