From 046453c10d8d0b62999c4f98fda9040fd11e2ff0 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Mon, 26 May 2014 22:28:33 +0200
Subject: [PATCH] Rename httpd.conf to httpd_vhost.conf Take language suffix
 into account Also fix cache indication on resources files using a timestamp
 in the path

---
 conf/{httpd.conf => httpd_vhost.conf} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename conf/{httpd.conf => httpd_vhost.conf} (85%)

diff --git a/conf/httpd.conf b/conf/httpd_vhost.conf
similarity index 85%
rename from conf/httpd.conf
rename to conf/httpd_vhost.conf
index 459c035..a2501f1 100644
--- a/conf/httpd.conf
+++ b/conf/httpd_vhost.conf
@@ -12,10 +12,10 @@
     ProxyPassReverse /socket.io/1/websocket ws://localhost:8888/socket.io/1/websocket
     ProxyPass /socket.io/ http://localhost:8888/socket.io/
     ProxyPassReverse /socket.io/ http://localhost:8888/socket.io/
-    AliasMatch ^/(\d{10}/)?((js|css|img|fonts|snd)/.*) /opt/vroom/public/$2
+    AliasMatch ^/([a-z]{2}/)?(\d{10}/)?((js|css|img|fonts|snd)/.*) /opt/vroom/public/$3
     RewriteEngine On
     RewriteCond %{REQUEST_FILENAME} !-f
-    RewriteRule ^/(\d{10}/)?(js|css|img|fonts|snd)/(.*)$ /$2/$3 [L]
+    RewriteRule ^/([a-z]{2}/)?(\d{10}/)?(js|css|img|fonts|snd)/(.*)$ /$3/$4 [L]
     ScriptAlias / /opt/vroom/public/vroom.pl/
     <Location />
       require all granted
@@ -31,7 +31,7 @@
         Header append Vary User-Agent env=!dont-vary
       </IfModule>
     </Location>
-    <LocationMatch "^/((js|css|img|fonts|snd)/)">
+    <LocationMatch "^/([a-z]{2}/)?(\d{10}/)?(js|css|img|fonts|snd)/">
       <IfModule mod_expires.c>
         ExpiresActive On
         ExpiresDefault "access plus 1 month"