X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3109ee7e5ed6fc8141c8cd700502b130fe468468..5f20611f74a1dd1f099790d8f29ed284ff40d39c:/cookbooks/tile/templates/default/apache.erb diff --git a/cookbooks/tile/templates/default/apache.erb b/cookbooks/tile/templates/default/apache.erb index ef4ee9f14..e5d7f1719 100644 --- a/cookbooks/tile/templates/default/apache.erb +++ b/cookbooks/tile/templates/default/apache.erb @@ -2,7 +2,7 @@ # Basic server configuration - ServerName <%= node[:fqdn] %> + ServerName <%= node.name %> ServerAlias tile.openstreetmap.org ServerAlias render.openstreetmap.org ServerAdmin webmaster@openstreetmap.org @@ -12,8 +12,8 @@ # SSLEngine on SSLProxyEngine on - SSLCertificateFile /etc/ssl/certs/<%= node[:fqdn] %>.pem - SSLCertificateKeyFile /etc/ssl/private/<%= node[:fqdn] %>.key + SSLCertificateFile /etc/ssl/certs/<%= node.name %>.pem + SSLCertificateKeyFile /etc/ssl/private/<%= node.name %>.key # Configure location of static files and CGI scripts DocumentRoot /srv/tile.openstreetmap.org/html @@ -37,6 +37,12 @@ # 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.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 @@ -44,9 +50,9 @@ 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] + 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 RedirectPermanent /processed_p.tar.bz2 https://planet.openstreetmap.org/historical-shapefiles/processed_p.tar.bz2 @@ -59,7 +65,7 @@ # Basic server configuration - ServerName <%= node[:fqdn] %> + ServerName <%= node.name %> ServerAlias tile.openstreetmap.org ServerAlias render.openstreetmap.org ServerAdmin webmaster@openstreetmap.org @@ -82,6 +88,9 @@ # 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.name %>" + # Remove Proxy request header to mitigate https://httpoxy.org/ RequestHeader unset Proxy early @@ -92,6 +101,8 @@ 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]