X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a2900827db68ded079ed6a9f7d275aa618ed311d..5f20611f74a1dd1f099790d8f29ed284ff40d39c:/cookbooks/tile/templates/default/apache.erb?ds=inline diff --git a/cookbooks/tile/templates/default/apache.erb b/cookbooks/tile/templates/default/apache.erb index f6364cc98..e5d7f1719 100644 --- a/cookbooks/tile/templates/default/apache.erb +++ b/cookbooks/tile/templates/default/apache.erb @@ -1,14 +1,20 @@ # DO NOT EDIT - This file is being maintained by Chef - + # Basic server configuration - ServerName <%= node[:fqdn] %> + ServerName <%= node.name %> ServerAlias tile.openstreetmap.org ServerAlias render.openstreetmap.org - ServerAlias *.render.openstreetmap.org - ServerAlias parent.tile.openstreetmap.org ServerAdmin webmaster@openstreetmap.org + # + # Enable SSL + # + SSLEngine on + SSLProxyEngine on + 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 ScriptAlias /cgi-bin/ /srv/tile.openstreetmap.org/cgi-bin/ @@ -31,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 @@ -38,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 @@ -51,6 +63,49 @@ RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/ + + # Basic server configuration + ServerName <%= node.name %> + ServerAlias tile.openstreetmap.org + ServerAlias render.openstreetmap.org + ServerAdmin webmaster@openstreetmap.org + + # Get the real remote IP for requests via a trusted proxy + RemoteIPHeader X-Forwarded-For +<% @caches.each do |cache| -%> +<% cache.ipaddresses(:role => :external).sort.each do |address| -%> + RemoteIPTrustedProxy <%= address %> +<% end -%> +<% end -%> + + # Setup logging + LogFormat "%a %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined_with_remoteip + CustomLog /var/log/apache2/access.log combined_with_remoteip + 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 "*" + + # 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 + + # Enable the rewrite engine + RewriteEngine on + + # Redirect ACME certificate challenges + 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] + + Options None AllowOverride None