x/bansho
Code Issues Proposed changes

Added BANSHO_AUTH_URL variable

Browse Source 
Change-Id: I809ab56f34673c6737033b3ea72db05f4fac96d1
This commit is contained in:
aviau 2015-05-06 17:20:18 -04:00
parent 610f7a9f9d
commit dba9d119f8
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@ -35,6 +35,7 @@ ENV BANSHO_BACKEND surveil
ENV BANSHO_PROD true ENV BANSHO_PROD true
ENV BANSHO_SURVEIL_URL http://surveil:8080/ ENV BANSHO_SURVEIL_URL http://surveil:8080/
ENV BANSHO_ADAGIOS_URL http://demo.kaji-project.org/ ENV BANSHO_ADAGIOS_URL http://demo.kaji-project.org/
ENV BANSHO_AUTH_URL http://surveil:8080/v2/auth/
CMD ./configure.sh && \ CMD ./configure.sh && \
cd /opt/bansho && \ cd /opt/bansho && \

3
container/000-default.conf
View File

@ -9,6 +9,9 @@
ProxyPreserveHost On 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/ ProxyPass /surveil/ http://surveil:8080/
ProxyPassReverse /surveil/ http://surveil:8080/ ProxyPassReverse /surveil/ http://surveil:8080/

8
container/configure.sh
View File

@ -5,9 +5,13 @@ CONFIG_FILE="/etc/apache2/sites-enabled/000-default.conf"
echo "=> Configuring apache ProxyPass ..." echo "=> Configuring apache ProxyPass ..."
# Surveil URLS # Surveil URLS
sed -i "s|ProxyPass /surveil/.*|ProxyPass /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} sed -i "s|ProxyPassReverse /surveil/ .*|ProxyPassReverse /surveil/ ${BANSHO_SURVEIL_URL}|g" ${CONFIG_FILE}
# Adagios URLS # Adagios URLS
sed -i "s|ProxyPass /adagios/.*|ProxyPass /adagios/ ${BANSHO_ADAGIOS_URL}|g" ${CONFIG_FILE} 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} 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}