X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/294adb0cb8e908dc374de0b63328538a0b568896..d694a499dfccf56d6290decf56809866cc7b21c6:/cookbooks/tile/templates/default/apache.erb diff --git a/cookbooks/tile/templates/default/apache.erb b/cookbooks/tile/templates/default/apache.erb index 4fdb67b8d..fd2334055 100644 --- a/cookbooks/tile/templates/default/apache.erb +++ b/cookbooks/tile/templates/default/apache.erb @@ -22,13 +22,18 @@ <% end -%> # Setup logging - CustomLog /var/log/apache2/access.log combined + 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 - # Set Access-Control-Allow-Origin header to allow Cross-origin resource sharing (CORS) + # Always set Access-Control-Allow-Origin so that simple CORS requests + # will always work and can be cached Header set Access-Control-Allow-Origin "*" + # Remove Proxy request header to mitigate https://httpoxy.org/ + RequestHeader unset Proxy early + # Enable the rewrite engine RewriteEngine on @@ -38,21 +43,22 @@ RewriteRule ^/(-?\d+)/(-?\d+)/(-?\d+)\.png/dirty/?$ /default/$1/$2/$3.png/dirty [PT,T=text/plain,L] # Historical Files redirect - Redirect /processed_p.tar.bz2 http://planet.openstreetmap.org/historical-shapefiles/processed_p.tar.bz2 - Redirect /shoreline_300.tar.bz2 http://planet.openstreetmap.org/historical-shapefiles/shoreline_300.tar.bz2 - Redirect /world_boundaries-spherical.tgz http://planet.openstreetmap.org/historical-shapefiles/world_boundaries-spherical.tgz + RedirectPermanent /processed_p.tar.bz2 http://planet.openstreetmap.org/historical-shapefiles/processed_p.tar.bz2 + RedirectPermanent /shoreline_300.tar.bz2 http://planet.openstreetmap.org/historical-shapefiles/shoreline_300.tar.bz2 + RedirectPermanent /world_boundaries-spherical.tgz http://planet.openstreetmap.org/historical-shapefiles/world_boundaries-spherical.tgz + + # Redirect ACME certificate challenges + RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/ Options None AllowOverride None - Order allow,deny - Allow from all + Require all granted Options ExecCGI AllowOverride None - Order allow,deny - Allow from all + Require all granted