From 49dace5cf4e85caa27aff4cd68912e79eaf66730 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Tue, 27 May 2014 09:43:03 +0200
Subject: [PATCH] Update mod_expires conf

---
 conf/httpd_alias.conf | 15 ++++++++-------
 conf/httpd_vhost.conf | 13 +++++++------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/conf/httpd_alias.conf b/conf/httpd_alias.conf
index ff364f6..0673379 100644
--- a/conf/httpd_alias.conf
+++ b/conf/httpd_alias.conf
@@ -20,13 +20,14 @@ ScriptAlias /vroom /opt/vroom/public/vroom.pl
   </IfModule>
   <IfModule mod_headers.c>
     Header append Vary User-Agent env=!dont-vary
-   </IfModule>
-    <FilesMatch "/opt/vroom/(js|css|img|fonts|snd)/.*">
-      <IfModule mod_expires.c>
-        ExpiresActive On
-        ExpiresDefault "access plus 1 month"
-      </IfModule>
-    </FilesMatch>
+    Header unset ETag
+  </IfModule>
+  ExpiresActive on
+  ExpiresDefault                     "access plus 1 month"
+  ExpiresByType application/json     "access plus 0 seconds"
+  ExpiresByType application/xml      "access plus 0 seconds"
+  ExpiresByType text/xml             "access plus 0 seconds"
+  ExpiresByType text/html            "access plus 0 seconds"
 </Directory>
 <Location /socket.io>
   SSLRequireSSL on
diff --git a/conf/httpd_vhost.conf b/conf/httpd_vhost.conf
index a2501f1..0bb0d59 100644
--- a/conf/httpd_vhost.conf
+++ b/conf/httpd_vhost.conf
@@ -29,13 +29,14 @@
       </IfModule>
       <IfModule mod_headers.c>
         Header append Vary User-Agent env=!dont-vary
+        Header unset ETag
       </IfModule>
+      ExpiresActive on
+      ExpiresDefault                     "access plus 1 month"
+      ExpiresByType application/json     "access plus 0 seconds"
+      ExpiresByType application/xml      "access plus 0 seconds"
+      ExpiresByType text/xml             "access plus 0 seconds"
+      ExpiresByType text/html            "access plus 0 seconds"
     </Location>
-    <LocationMatch "^/([a-z]{2}/)?(\d{10}/)?(js|css|img|fonts|snd)/">
-      <IfModule mod_expires.c>
-        ExpiresActive On
-        ExpiresDefault "access plus 1 month"
-      </IfModule>
-    </LocationMatch>
 </VirtualHost>