Remove trailing space

[chef.git] / cookbooks / tile / templates / default / apache.erb

diff --git a/cookbooks/tile/templates/default/apache.erb b/cookbooks/tile/templates/default/apache.erb
index 292744195021b201dc0481d5d64833a262d05090..fd2334055e74acb889dc248b0256c609e6863d48 100644 (file)
--- a/cookbooks/tile/templates/default/apache.erb
+++ b/cookbooks/tile/templates/default/apache.erb
@@ -43,9 +43,12 @@
   RewriteRule ^/(-?\d+)/(-?\d+)/(-?\d+)\.png/dirty/?$   /default/$1/$2/$3.png/dirty  [PT,T=text/plain,L]
 
   # Historical Files redirect
-  Redirect /processed_p.tar.bz2 http://planet.openstreetmap.org/historical-shapefiles/processed_p.tar.bz2
-  Redirect /shoreline_300.tar.bz2 http://planet.openstreetmap.org/historical-shapefiles/shoreline_300.tar.bz2
-  Redirect /world_boundaries-spherical.tgz http://planet.openstreetmap.org/historical-shapefiles/world_boundaries-spherical.tgz
+  RedirectPermanent /processed_p.tar.bz2 http://planet.openstreetmap.org/historical-shapefiles/processed_p.tar.bz2
+  RedirectPermanent /shoreline_300.tar.bz2 http://planet.openstreetmap.org/historical-shapefiles/shoreline_300.tar.bz2
+  RedirectPermanent /world_boundaries-spherical.tgz http://planet.openstreetmap.org/historical-shapefiles/world_boundaries-spherical.tgz
+
+  # Redirect ACME certificate challenges
+  RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
 </VirtualHost>
 
 <Directory /srv/tile.openstreetmap.org/html>
@@ -59,21 +62,3 @@
   AllowOverride None
   Require all granted
 </Directory>
-
-<Location /cgi-bin/export>
-  <RequireAll>
-    Require all granted
-    Require not ip 60.199.131.39
-    Require not ip 92.217.67.26
-    Require not ip 103.53.208.109
-    Require not ip 113.196.123.178
-    Require not ip 118.193.51.194
-    Require not ip 119.188.70.34
-    Require not ip 165.228.125.15
-    Require not ip 171.13.14.152
-    Require not ip 171.15.132.56
-    Require not ip 199.203.108.5
-    Require not ip 210.209.89.127
-    Require not ip 210.65.88.6
-  </RequireAll>
-</Location>