planet: Remove download speed limit

diff --git a/cookbooks/planet/files/default/cgi/HEADER.cgi b/cookbooks/planet/files/default/cgi/HEADER.cgi
index 2404f00ceef9565eafa6fe3b49b6424bfcc58945..6b2760293dcd699599f0cae10f3ced091560b204 100644 (file)
--- a/cookbooks/planet/files/default/cgi/HEADER.cgi
+++ b/cookbooks/planet/files/default/cgi/HEADER.cgi
@@ -70,7 +70,6 @@ print("""
 The files found here are regularly-updated, complete copies of the OpenStreetMap.org
 database, and those published before the 12 September 2012 are distributed under a Creative Commons Attribution-ShareAlike 2.0 license, those published after are  Open Data Commons Open Database License 1.0 licensed. For more information, <a href="https://wiki.openstreetmap.org/wiki/Planet.osm">see the project wiki</a>.
 </p>
-<p><div class="alert"><strong>WARNING</strong> Download speeds are currently restricted to 16 MB/s due to limited available capacity on our Internet connection. <a href="https://wiki.openstreetmap.org/wiki/Planet.osm#BitTorrent">Please use torrents</a> or <a href="https://wiki.openstreetmap.org/wiki/Planet.osm#Planet.osm_mirrors">a mirror</a> if possible.</div></p>
 <table id="about">
   <tr>
     <th>

diff --git a/cookbooks/planet/templates/default/apache.erb b/cookbooks/planet/templates/default/apache.erb
index 6d76783af12dffff011784d2108b1be4e3201eaa..5692d0ec4cc8dda3288cb0c398d0877e9eb9a049 100644 (file)
--- a/cookbooks/planet/templates/default/apache.erb
+++ b/cookbooks/planet/templates/default/apache.erb
@@ -82,13 +82,6 @@
         RewriteRule ^/planet/<%= year %>/full\-history/(history\-<%= year_two %>[0-1][0-9][0-3][0-9]\.osm\.bz2(\.torrent|\.md5)?)$ https://osm-planet-${ip2region:%{REMOTE_ADDR}|eu-central-1}.s3.amazonaws.com/planet-full-history/osm/<%= year %>/$1 [R,L]
           <% end %>
         <% end %>
-
-        # Temporary download rate limit due to upstream fibre connection issues. - 13 Jan 2020
-        <FilesMatch ".+\.(7z|bz2|gz|pbf|tgz|xz)$">
-          SetOutputFilter RATE_LIMIT
-          SetEnv rate-limit 16384
-          SetEnv rate-initial-burst 32768
-        </FilesMatch>
 </VirtualHost>
 
 <VirtualHost *:80>