X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/14e316cd3e1ab5f25a54d0765ebad61ac665ccb4..68e068818d559ef35bdf2a138a93596337828ef9:/cookbooks/tile/templates/default/apache.erb

diff --git a/cookbooks/tile/templates/default/apache.erb b/cookbooks/tile/templates/default/apache.erb
index a707cba05..ae0020cb9 100644
--- a/cookbooks/tile/templates/default/apache.erb
+++ b/cookbooks/tile/templates/default/apache.erb
@@ -19,6 +19,12 @@
   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 Fastly-Client-IP
+<% @fastly.sort.each do |address| -%>
+  RemoteIPTrustedProxy <%= address %>
+<% 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
@@ -41,6 +47,11 @@
   # Enable the rewrite engine
   RewriteEngine on
 
+  # Enforce rate limits
+  RewriteMap ipmap txt:/srv/tile.openstreetmap.org/conf/ip.map
+  RewriteCond ${ipmap:%{REMOTE_ADDR}} ^.+$
+  RewriteRule ^.*$ /${ipmap:%{REMOTE_ADDR}} [PT]
+
   # 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]
@@ -56,6 +67,7 @@
 
   # Restrict tile access to CDN nodes and admins
   <LocationMatch ^/default/\d+/\d+/\d+\.png$>
+    Require expr "%{CONN_REMOTE_ADDR} != %{REMOTE_ADDR}"
 <% @fastly.sort.each do |address| -%>
     Require ip <%= address %>
 <% end -%>
@@ -65,24 +77,18 @@
 <% @admins.sort.each do |address| -%>
     Require ip <%= address %>
 <% end -%>
+    # OSM Amsterdam Cogent IPv4
     Require ip 130.117.76.0/27
+    # OSM Amsterdam Cogent IPv6
     Require ip 2001:978:2:2C::/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
   </LocationMatch>
 
-  # Get the real remote IP for requests via a trusted proxy
-  RemoteIPHeader Fastly-Client-IP
-<% @fastly.sort.each do |address| -%>
-  RemoteIPTrustedProxy <%= address %>
-<% end -%>
-
-  # Enforce rate limits
-  RewriteMap ipmap txt:/srv/tile.openstreetmap.org/conf/ip.map
-  RewriteCond ${ipmap:%{REMOTE_ADDR}} ^.+$
-  RewriteRule ^.*$ /${ipmap:%{REMOTE_ADDR}} [PT]
-
   # Internal endpoint for blocked users
   <Location /blocked>
     Header always set Cache-Control private