[Lada-commits] [PATCH 5 of 5] merged

[Wald Commits]

# HG changeset patch
# User Raimund Renkert <raimund.renkert at intevation.de>
# Date 1456476099 -3600
# Node ID 39b16274977870f640b2b3c366482fef1a13572e
# Parent  d859fbfc8a53bc424460346d2ddd4ba24440718c
# Parent  3ef492b5240b1a886d1e27fc14a9622a38ff46cb
merged.

diff -r d859fbfc8a53 -r 39b162749778 Dockerfile
--- a/Dockerfile	Fri Feb 26 09:40:53 2016 +0100
+++ b/Dockerfile	Fri Feb 26 09:41:39 2016 +0100
@@ -5,7 +5,7 @@
 # Run from the repository root-dir with e.g.
 # `docker run --name lada_client
 #             --link lada_wildfly:lada-server
-#             -p 8180-8182:80-82 -d koala/lada_client'
+#             -p 8180-8184:80-84 -d koala/lada_client'
 #
 # The linked container may be created from the Dockerfile in the lada-server
 # repository.
@@ -35,6 +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
+EXPOSE 80 81 82 83 84
 
 CMD ["httpd-foreground"]
diff -r d859fbfc8a53 -r 39b162749778 custom-vhosts.conf
--- a/custom-vhosts.conf	Fri Feb 26 09:40:53 2016 +0100
+++ b/custom-vhosts.conf	Fri Feb 26 09:41:39 2016 +0100
@@ -17,6 +17,7 @@
 Listen 81
 Listen 82
 Listen 83
+Listen 84
 
 <VirtualHost *:80>
     ServerAdmin webmaster at localhost
@@ -44,7 +45,7 @@
     # Fake Shibboleth-like authentication headers
     RequestHeader set X-SHIB-user "testeins"
     # Status-Erfasser
-    RequestHeader set X-SHIB-roles "cn=mst_11010_status"
+    RequestHeader set X-SHIB-roles "cn=mst_11010_status,cn=land_11_status"
 
     # Add Proxy for Lada-server
     ProxyPass "/lada-server/" "http://lada-server:8080/lada-server-2.2.0/"
@@ -57,7 +58,7 @@
     CustomLog logs/lada-access_log common
 
     # Fake Shibboleth-like authentication headers
-    RequestHeader set X-SHIB-user "testeins"
+    RequestHeader set X-SHIB-user "testnull"
     # Status-Land
     RequestHeader set X-SHIB-roles "cn=land_11_status"
 
@@ -80,3 +81,18 @@
     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 *:84>
+    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"
+    # Stammdatenpflege-Land
+    RequestHeader set X-SHIB-roles "cn=land_06_stamm"
+
+    # 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>
diff -r d859fbfc8a53 -r 39b162749778 resources/i18n/Lada_de-DE.properties
--- a/resources/i18n/Lada_de-DE.properties	Fri Feb 26 09:40:53 2016 +0100
+++ b/resources/i18n/Lada_de-DE.properties	Fri Feb 26 09:41:39 2016 +0100
@@ -71,18 +71,18 @@
 offset:Offset
 letzteAenderung:Letzte Änderung
 bezeichnung:Bezeichnung
-mplId:mplID-TODOTEXT
-daErzeugerId:daErzeugerId-TODOTEXT
-prnId:prnId-TODOTEXT
-bearbeiter:bearbeiter-TODOTEXT
-bemerkung:bemerkung-TODOTEXT
-kurzBezeichnung:kurzBezeichnung-TODOTEXT
-ort:ort-TODOTEXT
-plz:plz-TODOTEXT
-strasse:strasse-TODOTEXT
-telefon:telefon-TODOTEXT
-tp:tp-TODOTEXT
-typ:typ-TODOTEXT
+mplId:mpl_id
+daErzeugerId:ID
+prnId:ID
+bearbeiter:Bearbeiter
+bemerkung:Bemerkung
+kurzBezeichnung:Kurzbezeichnung
+ort:Ort
+plz:PLZ
+strasse:Straße
+telefon:Telefon
+tp:tp
+typ:Typ
 
 
 emptytext.probenintervall:Wählen Sie ein Probenintervall