Update backend to v2.1.0-prerelease4

backendws/application.properties

@@ -1,5 +1,6 @@
 spring.profiles.active=prod,jwt
 management.endpoints.enabled-by-default=false
+server.error.whitelabel.enabled=true
 #-------------------------------------------------------------------------------
 # JDBC Config
 #-------------------------------------------------------------------------------
@@ -27,3 +28,9 @@ ws.ecdsa.credentials.publicKey=${BACKEND_PUBLIC}
 
 ws.ecdsa.credentials.privateKey=${BACKEND_PRIVATE}
 
+# Interops section (also: set country in docker-compose.yml)
+#ws.international.countries=IE
+#ws.origin.country=CH
+#ws.interops.irishbaseurl=https://interop-qa.nf-covid-services.com
+#ws.interops.irishauthorizationtoken=secret
+

backendws/entrypoint.sh

@@ -31,4 +31,4 @@ file_env JWTTOKEN_PUBLIC
 file_env DB_USER
 file_env DB_PASSWORD
 
-exec java -jar $JAVA_OPTS -Dlogging.config=/app/logback.xml -Dspring.config.location=/app/application.properties /app/dpppt-backend-sdk-ws.jar
+exec java -jar $JAVA_OPTS -Dlogging.config=/app/logback.xml -Dspring.config.location=/app/application.properties -Dws.origin.country=$COUNTRY /app/dpppt-backend-sdk-ws.jar

docker-compose-swarm.yml

@@ -16,6 +16,7 @@ services:
   backendws:
     image: localhost:5000/dp3t-backendws
     environment:
+      - COUNTRY=CH
       - DB_URL=jdbc:postgresql://backenddb:5432/dpppt
       - DB_USER=dpppt
       - DB_PASSWORD_FILE=/run/secrets/dp3t_backend_db

docker-compose.yml

@@ -16,6 +16,7 @@ services:
     image: localhost:5000/dp3t-backendws
     build: backendws
     environment:
+      - COUNTRY=CH
       - DB_URL=jdbc:postgresql://backenddb:5432/dpppt
       - DB_USER=dpppt
       - DB_PASSWORD_FILE=/run/secrets/dp3t_backend_db

frontend/Caddyfile

@@ -13,6 +13,7 @@ route {
 
 	# Backend
 	reverse_proxy /v1/* backendws:8080
+	reverse_proxy /v2/* backendws:8080
 }
 
 # Web apps