X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/52722858a6bccd05484db3af0bc7580f01e5d1b1..bd1414026d382a930aa60f7303c3c6a8b7ec8543:/cookbooks/tile/templates/default/apache.erb
diff --git a/cookbooks/tile/templates/default/apache.erb b/cookbooks/tile/templates/default/apache.erb
index 9199cb3a9..fbc781c90 100644
--- a/cookbooks/tile/templates/default/apache.erb
+++ b/cookbooks/tile/templates/default/apache.erb
@@ -22,10 +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
+ # 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
@@ -43,13 +51,19 @@
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
+
+
+<% @caches.each do |cache| -%>
+<% cache.ipaddresses(:role => :external).sort.each do |address| -%>
+ Require ip <%= address %>
+<% end -%>
+<% end -%>
+