X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/00067ab27e488394fcef9f47d26a93c2fbb0523e..31f1fa863c0b208a44e10ef3ae1571024ef0f0ae:/cookbooks/tile/templates/default/apache.erb?ds=sidebyside diff --git a/cookbooks/tile/templates/default/apache.erb b/cookbooks/tile/templates/default/apache.erb index 8df11453b..9652ec825 100644 --- a/cookbooks/tile/templates/default/apache.erb +++ b/cookbooks/tile/templates/default/apache.erb @@ -12,19 +12,17 @@ # SSLEngine on SSLProxyEngine on - SSLCertificateFile /etc/ssl/certs/<%= node.name %>.pem - SSLCertificateKeyFile /etc/ssl/private/<%= node.name %>.key + SSLCertificateFile /etc/ssl/certs/<%= node[:fqdn] %>.pem + SSLCertificateKeyFile /etc/ssl/private/<%= node[:fqdn] %>.key # Configure location of static files and CGI scripts DocumentRoot /srv/tile.openstreetmap.org/html ScriptAlias /cgi-bin/ /srv/tile.openstreetmap.org/cgi-bin/ # 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| -%> + RemoteIPHeader Fastly-Client-IP +<% @fastly.sort.each do |address| -%> RemoteIPTrustedProxy <%= address %> -<% end -%> <% end -%> # Setup logging @@ -40,6 +38,9 @@ # 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 @@ -52,12 +53,39 @@ 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/ + + # Restrict tile access to CDN nodes and admins + + Require expr "%{CONN_REMOTE_ADDR} != %{REMOTE_ADDR}" + # Fastly POPs +<% @fastly.sort.each do |address| -%> + Require ip <%= address %> +<% end -%> + # StatusCake monitoring +<% @statuscake.sort.reject { |address| address.empty? }.each do |address| -%> + Require ip <%= address %> +<% end -%> + # Administrators +<% @admins.sort.each do |address| -%> + Require ip <%= address %> +<% end -%> + # OSM Amsterdam IPv4 + Require ip 184.104.179.128/27 + # OSM Amsterdam IPv6 + Require ip 2001:470:1:fa1::/64 + # OSM Dublin IPv4 + Require ip 184.104.226.96/27 + # OSM Dublin IPv6 + Require ip 2001:470:1:b3b::/64 + # OSM UCL IPv4 + Require ip 193.60.236.0/24 + @@ -67,14 +95,6 @@ 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