X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/2dc17000f8f4c51332d20d3b28fa746367dd7838..1a062eb5304d0ef835313e5948053fcdccf20ecf:/cookbooks/tile/templates/default/apache.erb diff --git a/cookbooks/tile/templates/default/apache.erb b/cookbooks/tile/templates/default/apache.erb index c24e06e82..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] @@ -80,10 +75,10 @@ <% @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 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 @@ -91,12 +86,6 @@ # OSM UCL IPv4 Require ip 193.60.236.0/24 - - # Internal endpoint for blocked users - - Header always set Cache-Control private - Redirect 429 -