From dba9d119f8e0f6fc4cb5d096712c4b8889a13501 Mon Sep 17 00:00:00 2001
From: aviau <alexandre.viau@savoirfairelinux.com>
Date: Wed, 6 May 2015 17:20:18 -0400
Subject: [PATCH] Added BANSHO_AUTH_URL variable

Change-Id: I809ab56f34673c6737033b3ea72db05f4fac96d1
---
 Dockerfile                 | 1 +
 container/000-default.conf | 3 +++
 container/configure.sh     | 8 ++++++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 21947d8..833943b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,6 +35,7 @@ ENV BANSHO_BACKEND surveil
 ENV BANSHO_PROD true
 ENV BANSHO_SURVEIL_URL http://surveil:8080/
 ENV BANSHO_ADAGIOS_URL http://demo.kaji-project.org/
+ENV BANSHO_AUTH_URL http://surveil:8080/v2/auth/
 
 CMD ./configure.sh && \
     cd /opt/bansho && \
diff --git a/container/000-default.conf b/container/000-default.conf
index 39bfb1c..35976d8 100644
--- a/container/000-default.conf
+++ b/container/000-default.conf
@@ -9,6 +9,9 @@
 
     ProxyPreserveHost On
 
+    ProxyPass /surveil/v2/auth/ http://surveil:8080/v2/auth/
+    ProxyPassReverse /surveil/v2/auth/ http://surveil:8080/v2/auth/
+
     ProxyPass /surveil/ http://surveil:8080/
     ProxyPassReverse /surveil/ http://surveil:8080/
 
diff --git a/container/configure.sh b/container/configure.sh
index c6812b7..5fc8adf 100755
--- a/container/configure.sh
+++ b/container/configure.sh
@@ -5,9 +5,13 @@ CONFIG_FILE="/etc/apache2/sites-enabled/000-default.conf"
 echo "=> Configuring apache ProxyPass ..."
 
 # Surveil URLS
-sed -i "s|ProxyPass /surveil/.*|ProxyPass /surveil/ ${BANSHO_SURVEIL_URL}|g" ${CONFIG_FILE}
-sed -i "s|ProxyPassReverse /surveil/.*|ProxyPassReverse /surveil/ ${BANSHO_SURVEIL_URL}|g" ${CONFIG_FILE}
+sed -i "s|ProxyPass /surveil/ .*|ProxyPass /surveil/ ${BANSHO_SURVEIL_URL}|g" ${CONFIG_FILE}
+sed -i "s|ProxyPassReverse /surveil/ .*|ProxyPassReverse /surveil/ ${BANSHO_SURVEIL_URL}|g" ${CONFIG_FILE}
 
 # Adagios URLS
 sed -i "s|ProxyPass /adagios/.*|ProxyPass /adagios/ ${BANSHO_ADAGIOS_URL}|g" ${CONFIG_FILE}
 sed -i "s|ProxyPassReverse /adagios/.*|ProxyPassReverse /adagios/ ${BANSHO_ADAGIOS_URL}|g" ${CONFIG_FILE}
+
+# Bansho auth URL
+sed -i "s|ProxyPass /surveil/v2/auth/.*|ProxyPass /surveil/v2/auth/ ${BANSHO_AUTH_URL}|g" ${CONFIG_FILE}
+sed -i "s|ProxyPassReverse /surveil/v2/auth/.*|ProxyPass /surveil/v2/auth/ ${BANSHO_AUTH_URL}|g" ${CONFIG_FILE}