[Lada-commits] [PATCH] Serve roles on different ports for easier testing
Wald Commits
scm-commit at wald.intevation.org
Thu Feb 4 14:16:46 CET 2016
# HG changeset patch
# User Tom Gottfried <tom at intevation.de>
# Date 1454591803 -3600
# Node ID 418e25969a16d65960d69041dad447e9146a18f8
# Parent d8e74bd89d6bc88b89072732e0ca45f796964044
Serve roles on different ports for easier testing.
diff -r d8e74bd89d6b -r 418e25969a16 Dockerfile
--- a/Dockerfile Thu Feb 04 12:08:21 2016 +0100
+++ b/Dockerfile Thu Feb 04 14:16:43 2016 +0100
@@ -4,7 +4,8 @@
# Build with e.g. `docker build --force-rm=true -t koala/lada_client .'
# Run from the repository root-dir with e.g.
# `docker run --name lada_client
-# --link lada_wildfly:lada-server -p 8182:80 -d koala/lada_client'
+# --link lada_wildfly:lada-server
+# -p 8180-8182:80-82 -d koala/lada_client'
#
# The linked container may be created from the Dockerfile in the lada-server
# repository.
@@ -34,4 +35,6 @@
RUN ln -sf $PWD/custom-httpd.conf $HTTPD_PREFIX/conf/httpd.conf
RUN ln -sf $PWD/custom-vhosts.conf $HTTPD_PREFIX/conf/extra/httpd-vhosts.conf
+EXPOSE 80 81 82 83
+
CMD ["httpd-foreground"]
diff -r d8e74bd89d6b -r 418e25969a16 custom-vhosts.conf
--- a/custom-vhosts.conf Thu Feb 04 12:08:21 2016 +0100
+++ b/custom-vhosts.conf Thu Feb 04 14:16:43 2016 +0100
@@ -13,6 +13,10 @@
#
# You may use the command line option '-S' to verify your virtual host
# configuration.
+Listen 80
+Listen 81
+Listen 82
+Listen 83
<VirtualHost *:80>
ServerAdmin webmaster at localhost
@@ -21,7 +25,8 @@
# Fake Shibboleth-like authentication headers
RequestHeader set X-SHIB-user "testeins"
- RequestHeader set X-SHIB-roles "cn=Imis-World, cn=mst_06010, cn=mst_11010"
+ # Erfasser
+ RequestHeader set X-SHIB-roles "cn=mst_11010"
# Add Proxy for Lada-server
ProxyPass "/lada-server/" "http://lada-server:8080/lada-server-2.2.0/"
@@ -30,3 +35,48 @@
#ProxyPass /lada-client/lada-printer http://MAPFISH-PRINT-URL/lada_print
#ProxyPassReverse /lada-client/lada-printer http://MAPFISH-PRINT-URL/lada_print
</VirtualHost>
+
+<VirtualHost *:81>
+ ServerAdmin webmaster at localhost
+ ErrorLog logs/lada-error_log
+ CustomLog logs/lada-access_log common
+
+ # Fake Shibboleth-like authentication headers
+ RequestHeader set X-SHIB-user "testeins"
+ # Status-Erfasser
+ RequestHeader set X-SHIB-roles "cn=mst_11010_status"
+
+ # Add Proxy for Lada-server
+ ProxyPass "/lada-server/" "http://lada-server:8080/lada-server-2.2.0/"
+ ProxyPassReverse "/lada-server/" "http://lada-server:8080/lada-server-2.2.0/"
+</VirtualHost>
+
+<VirtualHost *:82>
+ ServerAdmin webmaster at localhost
+ ErrorLog logs/lada-error_log
+ CustomLog logs/lada-access_log common
+
+ # Fake Shibboleth-like authentication headers
+ RequestHeader set X-SHIB-user "testeins"
+ # Status-Land
+ RequestHeader set X-SHIB-roles "cn=land_11_status"
+
+ # Add Proxy for Lada-server
+ ProxyPass "/lada-server/" "http://lada-server:8080/lada-server-2.2.0/"
+ ProxyPassReverse "/lada-server/" "http://lada-server:8080/lada-server-2.2.0/"
+</VirtualHost>
+
+<VirtualHost *:83>
+ ServerAdmin webmaster at localhost
+ ErrorLog logs/lada-error_log
+ CustomLog logs/lada-access_log common
+
+ # Fake Shibboleth-like authentication headers
+ RequestHeader set X-SHIB-user "testeins"
+ # Status-Leitstelle
+ RequestHeader set X-SHIB-roles "cn=lst_kiel"
+
+ # Add Proxy for Lada-server
+ ProxyPass "/lada-server/" "http://lada-server:8080/lada-server-2.2.0/"
+ ProxyPassReverse "/lada-server/" "http://lada-server:8080/lada-server-2.2.0/"
+</VirtualHost>
More information about the Lada-commits
mailing list