Merge remote-tracking branch 'github/pull/325'

[chef.git] / cookbooks / web / templates / default / apache.frontend.erb

diff --git a/cookbooks/web/templates/default/apache.frontend.erb b/cookbooks/web/templates/default/apache.frontend.erb
index 12beede35b1fead683cdb490f11cf9322e97c6a3..685912862ad913327a2ec09c855df21604cf7eb3 100644 (file)
--- a/cookbooks/web/templates/default/apache.frontend.erb
+++ b/cookbooks/web/templates/default/apache.frontend.erb
@@ -58,13 +58,14 @@
   RewriteRule . - [F,L]
 
   #
-  # Block requests for the old 404 map tile
-  # and force cache headers on response
+  # 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"
-    RewriteRule ^ - [G,L]
   </Location>
 
   #
@@ -122,6 +123,9 @@
     ExpiresDefault "access plus 10 years"
   </Location>
   <Location /openlayers/>
+    Header unset Last-Modified
+    FileETag Size
+
     ExpiresDefault "access plus 7 days"
   </Location>
 
@@ -138,7 +142,7 @@
   SetEnv OPENSTREETMAP_STATUS <%= @status %>
   SetEnv SECRET_KEY_BASE <%= @secret_key_base %>
   Alias /favicon.ico <%= node[:web][:base_directory] %>/rails/app/assets/favicons/favicon.ico
-  Alias /openlayers <%= node[:web][:base_directory] %>/rails/vendor/assets/openlayers
+  Alias /openlayers <%= node[:web][:base_directory] %>/static/openlayers
   Alias /stats /store/rails/stats
   Alias /user/image /store/rails/user/image
   Alias /attachments /store/rails/attachments