From 867df625e898ce86233a9869fe414303ae47ee33 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Sun, 12 Oct 2014 19:35:24 +0200
Subject: [PATCH] Adapt httpd sample conf to work with the new hypnotoad way

---
 conf/httpd_alias.conf |  9 +++++++--
 conf/httpd_vhost.conf | 11 +++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/conf/httpd_alias.conf b/conf/httpd_alias.conf
index 690a3ad..3db2f15 100644
--- a/conf/httpd_alias.conf
+++ b/conf/httpd_alias.conf
@@ -15,14 +15,19 @@ ProxyPassReverse /socket.io/ http://localhost:8888/socket.io/
 # ProxyPass /etherpad/ http://localhost:9001/
 # ProxyPassReverse /etherpad/ http://localhost:9001/
 
-AliasMatch ^/vroom/([a-z]{2}/)?(\d{10}/)?((js|css|img|fonts|snd)/.*) /opt/vroom/public/$3
 RewriteEngine On
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteRule ^/vroom/([a-z]{2}/)?(\d{10}/)?(js|css|img|fonts|snd)/(.*)$ /vroom/$3/$4 [L]
-ScriptAlias /vroom /opt/vroom/public/vroom.pl
+ProxyPass /vroom/ http://127.0.0.1:8090/
+ProxyPassReverse /vroom/ http://127.0.0.1:8090/
+<Proxy /vroom/*>
+  ProxyPreserveHost On
+</Proxy>
 <Directory /opt/vroom>
   SSLRequireSSL on
   require all granted
+</Directory>
+<Location />
   <IfModule mod_deflate.c>
     AddOutputFilterByType DEFLATE text/html text/plain text/xml text/javascript text/css
     SetOutputFilter DEFLATE
diff --git a/conf/httpd_vhost.conf b/conf/httpd_vhost.conf
index 9a043b3..8da0e24 100644
--- a/conf/httpd_vhost.conf
+++ b/conf/httpd_vhost.conf
@@ -26,13 +26,20 @@
     # ProxyPassReverse /etherpad/ http://localhost:9001/
 
 
-    AliasMatch ^/([a-z]{2}/)?(\d{10}/)?((js|css|img|fonts|snd)/.*) /opt/vroom/public/$3
     RewriteEngine On
     RewriteCond %{REQUEST_FILENAME} !-f
     RewriteRule ^/([a-z]{2}/)?(\d{10}/)?(js|css|img|fonts|snd)/(.*)$ /$3/$4 [L]
     ScriptAlias / /opt/vroom/public/vroom.pl/
+    ProxyPass / http://127.0.0.1:8090/
+    ProxyPassReverse / http://127.0.0.1:8090/
+    <Proxy *>
+      ProxyPreserveHost On
+    </Proxy>
+    <Directory /opt/devroom/public>
+      Require all granted
+      SSLRequireSSL on
+    </Directory>
     <Location />
-      require all granted
       <IfModule mod_deflate.c>
         AddOutputFilterByType DEFLATE text/html text/plain text/xml text/javascript text/css
         SetOutputFilter DEFLATE