Mercurial > lada > lada-client
changeset 1216:75e5caebd392
Adapt version name.
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Fri, 14 Oct 2016 16:06:21 +0200 |
| parents | 3ee306a004c2 |
| children | 4270da0f7d3b |
| files | app.js custom-vhosts.conf |
| diffstat | 2 files changed, 13 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/app.js Fri Oct 14 15:25:39 2016 +0200 +++ b/app.js Fri Oct 14 16:06:21 2016 +0200 @@ -79,7 +79,7 @@ Lada.logintime = ''; Lada.mst = []; Lada.netzbetreiber = []; - Lada.clientVersion = '2.3'; + Lada.clientVersion = '2.4.0dev'; Lada.serverVersion = ''; var queryString = document.location.href.split('?')[1];
--- a/custom-vhosts.conf Fri Oct 14 15:25:39 2016 +0200 +++ b/custom-vhosts.conf Fri Oct 14 16:06:21 2016 +0200 @@ -21,6 +21,8 @@ Listen 83 Listen 84 +Define LADA_SERVER_VERSION 2.4.0dev + <VirtualHost *:80> ServerAdmin webmaster@localhost ErrorLog ${APACHE_LOG_DIR}/error.log @@ -32,8 +34,8 @@ RequestHeader set X-SHIB-roles "cn=mst_11010" # Add Proxy for Lada-server - ProxyPass "/lada-server/" "http://lada-server:8080/lada-server-2.3.0/" - ProxyPassReverse "/lada-server/" "http://lada-server:8080/lada-server-2.3.0/" + ProxyPass "/lada-server/" "http://lada-server:8080/lada-server-${LADA_SERVER_VERSION}/" + ProxyPassReverse "/lada-server/" "http://lada-server:8080/lada-server-${LADA_SERVER_VERSION}/" # Add Proxy for printing #ProxyPass /lada-client/lada-printer http://MAPFISH-PRINT-URL/lada_print #ProxyPassReverse /lada-client/lada-printer http://MAPFISH-PRINT-URL/lada_print @@ -50,8 +52,8 @@ RequestHeader set X-SHIB-roles "cn=mst_11010_status" # Add Proxy for Lada-server - ProxyPass "/lada-server/" "http://lada-server:8080/lada-server-2.3.0/" - ProxyPassReverse "/lada-server/" "http://lada-server:8080/lada-server-2.3.0/" + ProxyPass "/lada-server/" "http://lada-server:8080/lada-server-${LADA_SERVER_VERSION}/" + ProxyPassReverse "/lada-server/" "http://lada-server:8080/lada-server-${LADA_SERVER_VERSION}/" </VirtualHost> <VirtualHost *:82> @@ -65,8 +67,8 @@ RequestHeader set X-SHIB-roles "cn=land_11_status" # Add Proxy for Lada-server - ProxyPass "/lada-server/" "http://lada-server:8080/lada-server-2.3.0/" - ProxyPassReverse "/lada-server/" "http://lada-server:8080/lada-server-2.3.0/" + ProxyPass "/lada-server/" "http://lada-server:8080/lada-server-${LADA_SERVER_VERSION}/" + ProxyPassReverse "/lada-server/" "http://lada-server:8080/lada-server-${LADA_SERVER_VERSION}/" </VirtualHost> <VirtualHost *:83> @@ -80,8 +82,8 @@ RequestHeader set X-SHIB-roles "cn=lst_kiel" # Add Proxy for Lada-server - ProxyPass "/lada-server/" "http://lada-server:8080/lada-server-2.3.0/" - ProxyPassReverse "/lada-server/" "http://lada-server:8080/lada-server-2.3.0/" + ProxyPass "/lada-server/" "http://lada-server:8080/lada-server-${LADA_SERVER_VERSION}/" + ProxyPassReverse "/lada-server/" "http://lada-server:8080/lada-server-${LADA_SERVER_VERSION}/" </VirtualHost> <VirtualHost *:84> @@ -95,6 +97,6 @@ RequestHeader set X-SHIB-roles "cn=land_06_stamm" # Add Proxy for Lada-server - ProxyPass "/lada-server/" "http://lada-server:8080/lada-server-2.3.0/" - ProxyPassReverse "/lada-server/" "http://lada-server:8080/lada-server-2.3.0/" + ProxyPass "/lada-server/" "http://lada-server:8080/lada-server-${LADA_SERVER_VERSION}/" + ProxyPassReverse "/lada-server/" "http://lada-server:8080/lada-server-${LADA_SERVER_VERSION}/" </VirtualHost>