X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/5d066a8a35324c0291594563e8413fc11fd71456..70c9fb3921e6f0c95828d52f3538cde194cc3414:/cookbooks/tile/templates/default/apache.erb
diff --git a/cookbooks/tile/templates/default/apache.erb b/cookbooks/tile/templates/default/apache.erb
index ac4ba8f12..c41c923bf 100644
--- a/cookbooks/tile/templates/default/apache.erb
+++ b/cookbooks/tile/templates/default/apache.erb
@@ -4,6 +4,8 @@
# Basic server configuration
ServerName <%= node[:fqdn] %>
ServerAlias tile.openstreetmap.org
+ ServerAlias render.openstreetmap.org
+ ServerAlias *.render.openstreetmap.org
ServerAlias parent.tile.openstreetmap.org
ServerAdmin webmaster@openstreetmap.org
@@ -20,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
@@ -39,19 +46,16 @@
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
-
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