X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/afc6ef7874e73bc70ef594aca9af58e2d3ce5466..18db4c72edea0d2cd4df5b7d7d9011df618d0ff9:/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 696bb6e3b..9652ec825 100644
--- a/cookbooks/tile/templates/default/apache.erb
+++ b/cookbooks/tile/templates/default/apache.erb
@@ -47,11 +47,6 @@
   # 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]
@@ -68,27 +63,29 @@
   # Restrict tile access to CDN nodes and admins
   <LocationMatch ^/default/\d+/\d+/\d+\.png$>
     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 -%>
-    Require ip 130.117.76.0/27
-    Require ip 2001:978:2:2C::/64
+    # 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
   </LocationMatch>
-
-  # Internal endpoint for blocked users
-  <Location /blocked>
-    Header always set Cache-Control private
-    Redirect 429
-  </Location>
 </VirtualHost>
 
 <VirtualHost *:80>