X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/8490395fe10856053dba05774cda6c2ffe52aa6e..5e5cb7ccbcfcd4e3696ddcd0a3e5218c254e429d:/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 5944e5f18..4c283299b 100644
--- a/cookbooks/web/templates/default/apache.frontend.erb
+++ b/cookbooks/web/templates/default/apache.frontend.erb
@@ -95,10 +95,11 @@
   # Set expiry for assets
   #
   <Location /assets/>
-    Header unset ETag
-    FileETag None
+    Header unset Last-Modified
+    FileETag Size
 
     ExpiresDefault "access plus 1 year"
+    Header set Cache-Control "immutable, max-age=31536000"
   </Location>
 
   #
@@ -290,13 +291,16 @@
 
   RewriteCond "%{HTTP:Accept-encoding}" "gzip"
   RewriteCond "%{REQUEST_FILENAME}\.gz" -s
-  RewriteRule "^(.*)\.(css|js|svg)" "$1\.$2\.gz" [QSA]
+  RewriteRule "^(.*)\.(css|ico|js|json|svg|xml)$" "$1\.$2\.gz" [QSA]
 
   RewriteRule "\.css\.gz$" "-" [T=text/css,E=no-gzip:1]
+  RewriteRule "\.ico\.gz$"  "-" [T=image/vnd.microsoft.icon,E=no-gzip:1]
   RewriteRule "\.js\.gz$"  "-" [T=text/javascript,E=no-gzip:1]
+  RewriteRule "\.json\.gz$"  "-" [T=application/json,E=no-gzip:1]
   RewriteRule "\.svg\.gz$"  "-" [T=image/svg+xml,E=no-gzip:1]
+  RewriteRule "\.xml\.gz$"  "-" [T=application/xml,E=no-gzip:1]
 
-  <FilesMatch "(\.js\.gz|\.css\.gz|\.svg\.gz)$">
+  <FilesMatch "\.(css|ico|js|json|svg|xml)\.gz$">
     Header append Content-Encoding gzip
     Header append Vary Accept-Encoding
   </FilesMatch>