Force caching of 410 on openlayers 404 tile

ExpiresDefault only returns headers on 2xx responses so set the
headers manually for the 410 response

Also set a long expiry for redirect from http and other domains.

Closes #178

diff --git a/cookbooks/web/templates/default/apache.frontend.erb b/cookbooks/web/templates/default/apache.frontend.erb
index 6cbf8641808b4b6d9085e691091ac2d12b47e1c5..6e8ab95ed132f2f53658134c55a7ee7e10e053d5 100644 (file)
--- a/cookbooks/web/templates/default/apache.frontend.erb
+++ b/cookbooks/web/templates/default/apache.frontend.erb
@@ -59,8 +59,13 @@
 
   #
   # Block requests for the old 404 map tile
+  # and force cache headers on response
   #
-  RewriteRule ^/openlayers/img/404.png$ - [G,L]
+  <Location /openlayers/img/404.png>
+    Header always set Cache-Control "max-age=31536000"
+    Header always set Expires "Tue, 19 Jan 2038 03:14:08 GMT"
+    RewriteRule ^ - [G,L]
+  </Location>
 
   #
   # Block attempts to access old API versions
@@ -265,12 +270,15 @@
   ServerName openstreetmap.org
   ServerAlias *
 
+  Header always set Cache-Control "max-age=31536000"
+  Header always set Expires "Tue, 19 Jan 2038 03:14:08 GMT"
+
   RewriteEngine on
 
   RewriteRule ^/\.well-known/acme-challenge/(.*)$ http://acme.openstreetmap.org/.well-known/acme-challenge/$1 [R=permanent,L]
 
   RewriteCond %{REQUEST_URI} !^/server-status$
-  RewriteRule ^(.*)$ https://openstreetmap.org$1 [L,NE,R=permanent]
+  RewriteRule ^(.*)$ https://www.openstreetmap.org$1 [L,NE,R=permanent]
 </VirtualHost>
 
 <VirtualHost *:443>
@@ -281,6 +289,9 @@
   SSLCertificateFile /etc/ssl/certs/www.openstreetmap.org.pem
   SSLCertificateKeyFile /etc/ssl/private/www.openstreetmap.org.key
 
+  Header always set Cache-Control "max-age=31536000"
+  Header always set Expires "Tue, 19 Jan 2038 03:14:08 GMT"
+
   RedirectPermanent / https://www.openstreetmap.org/
 </VirtualHost>