From: Tom Hughes <tom@compton.nu>
Date: Wed, 22 Jul 2020 21:40:26 +0000 (+0100)
Subject: Serve all openlayers legacy content with long expiry
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/58513ca6865fbbd1849fb128f4b153a59b6f93ea

Serve all openlayers legacy content with long expiry
---

diff --git a/cookbooks/web/templates/default/apache.frontend.erb b/cookbooks/web/templates/default/apache.frontend.erb
index 685912862..6690a255e 100644
--- a/cookbooks/web/templates/default/apache.frontend.erb
+++ b/cookbooks/web/templates/default/apache.frontend.erb
@@ -57,17 +57,6 @@
   RewriteCond %{HTTP_USER_AGENT} "OSMApp Tuner"
   RewriteRule . - [F,L]
 
-  #
-  # Force extended cache headers on the old 404 map tile
-  #
-  <Location /openlayers/img/404.png>
-    Header unset Last-Modified
-    FileETag Size
-
-    Header always set Cache-Control "public, max-age=31536000, immutable"
-    Header always set Expires "Tue, 19 Jan 2038 03:14:07 GMT"
-  </Location>
-
   #
   # Block attempts to access old API versions
   #
@@ -126,7 +115,8 @@
     Header unset Last-Modified
     FileETag Size
 
-    ExpiresDefault "access plus 7 days"
+    Header always set Cache-Control "public, max-age=31536000, immutable"
+    Header always set Expires "Tue, 19 Jan 2038 03:14:07 GMT"
   </Location>
 
   #