diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36155cb9c..fc3a07c63 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
# Changelog
+## [1.1.1](https://github.com/iris-connect/iris-client/compare/v1.1.0...v1.1.1) (2021-11-17)
+
+
+### Bug Fixes
+
+* The configuration for the private proxy now contains the necessary variable declarations again. Thanks to [@jl-sitnrw](https://github.com/jl-sitnrw) ([71ea823](https://github.com/iris-connect/iris-client/commit/71ea8239b07729729c9b4916e0b8ba28eef1222d)), closes [#467](https://github.com/iris-connect/iris-client/issues/467)
+* The endpoint of the JSONRPC client is set to the right variable now. ([9d598bc](https://github.com/iris-connect/iris-client/commit/9d598bc3267f69ceeaa4e84d34d8abfe4f0ffd33))
+* With the stand alone installation, there is no longer an error at startup because a property is set with the wrong name. Thanks to [@jl-sitnrw](https://github.com/jl-sitnrw) ([8aa669d](https://github.com/iris-connect/iris-client/commit/8aa669d392db703828b3e588ab708ef5e74fb073)), closes [#466](https://github.com/iris-connect/iris-client/issues/466)
+
# [1.1.0](https://github.com/iris-connect/iris-client/compare/v1.0.1...v1.1.0) (2021-11-03)
diff --git a/infrastructure/deployment/docker-compose-ext-postgres.yml b/infrastructure/deployment/docker-compose-ext-postgres.yml
index 3fcf19423..8cfaa2469 100644
--- a/infrastructure/deployment/docker-compose-ext-postgres.yml
+++ b/infrastructure/deployment/docker-compose-ext-postgres.yml
@@ -24,7 +24,7 @@ services:
SECURITY_AUTH_DB_ADMIN_USER_NAME:
SECURITY_AUTH_DB_ADMIN_USER_PASSWORD:
SECURITY_JWT_JWT_SHARED_SECRET:
- IRIS_LOCATION_SERVICE_ENDPOINT: ${EPS_LS_NAME}
+ IRIS_BACKEND_SERVICE_ENDPOINT: ${EPS_LS_NAME}
IRIS_CLIENT_BASEPATH: "https://${IRIS_CLIENT_DOMAIN}"
EXT_APP_DW_BASEURL:
restart: unless-stopped
diff --git a/infrastructure/deployment/docker-compose.yml b/infrastructure/deployment/docker-compose.yml
index c96e67136..84eb26e13 100644
--- a/infrastructure/deployment/docker-compose.yml
+++ b/infrastructure/deployment/docker-compose.yml
@@ -53,7 +53,7 @@ services:
SECURITY_AUTH_DB_ADMIN_USER_NAME:
SECURITY_AUTH_DB_ADMIN_USER_PASSWORD:
SECURITY_JWT_JWT_SHARED_SECRET:
- IRIS_BACKEND-SERVICE_ENDPOINT: ${EPS_LS_NAME}
+ IRIS_BACKEND_SERVICE_ENDPOINT: ${EPS_LS_NAME}
IRIS_CLIENT_BASEPATH: "https://${IRIS_CLIENT_DOMAIN}"
EXT_APP_DW_BASEURL:
depends_on:
diff --git a/infrastructure/dev/docker-compose.yml b/infrastructure/dev/docker-compose.yml
index d708c17bd..6ccf7385f 100644
--- a/infrastructure/dev/docker-compose.yml
+++ b/infrastructure/dev/docker-compose.yml
@@ -55,7 +55,7 @@ services:
EPS_CLIENT_PROXY_CLIENT_URL: https://private-proxy-1:7766/jsonrpc
PROXY_SERVICE_TARGET_SUBDOMAIN: proxy.dev.test-gesundheitsamt.de
IRIS_CLIENT_BASEPATH: https://iris-frontend:28080
- IRIS_BACKEND-SERVICE_ENDPOINT: ls-1
+ IRIS_BACKEND_SERVICE_ENDPOINT: ls-1
SPRING_MAIL_PROPERTIES_RECIPIENT_CASE_DATA_RECEIVED_NAME: "Tester"
SPRING_MAIL_PROPERTIES_RECIPIENT_CASE_DATA_RECEIVED_EMAIL: "tester@iris-gateway.de"
SPRING_MAIL_PROPERTIES_RECIPIENT_EVENT_DATA_RECEIVED_NAME: "Tester"
diff --git a/infrastructure/stand-alone-deployment/conf/proxy/roles/live/private-proxy/001_default.yml b/infrastructure/stand-alone-deployment/conf/proxy/roles/live/private-proxy/001_default.yml
index 9f66ae6da..6d95823ae 100644
--- a/infrastructure/stand-alone-deployment/conf/proxy/roles/live/private-proxy/001_default.yml
+++ b/infrastructure/stand-alone-deployment/conf/proxy/roles/live/private-proxy/001_default.yml
@@ -23,6 +23,14 @@ vars:
source: env
variable: PROXY_TLS_CERT_KEY
type: string
+ IRIS_CLIENT_BFF_ENDPOINT:
+ source: env
+ variable: IRIS_CLIENT_BFF_ENDPOINT
+ type: string
+ PRIVATE_PROXY_EPS_ENDPOINT:
+ source: env
+ variable: PRIVATE_PROXY_EPS_ENDPOINT
+ type: string
private:
name: "$PROXY_OP"
@@ -44,7 +52,7 @@ private:
key_file: "$DIR/../../../certs/$PROXY_TLS_CERT_KEY"
jsonrpc_client:
- endpoint: https://private-proxy-eps:7766/jsonrpc
+ endpoint: "$PRIVATE_PROXY_EPS_ENDPOINT"
tls:
server_name: "$PROXY_OP"
ca_certificate_files:
diff --git a/infrastructure/stand-alone-deployment/scripts/start-iris-client-bff.sh b/infrastructure/stand-alone-deployment/scripts/start-iris-client-bff.sh
index 9f63af397..15b06c3b1 100755
--- a/infrastructure/stand-alone-deployment/scripts/start-iris-client-bff.sh
+++ b/infrastructure/stand-alone-deployment/scripts/start-iris-client-bff.sh
@@ -11,7 +11,7 @@ export SECURITY_AUTH_DB_ADMIN_USER_NAME=$SECURITY_AUTH_DB_ADMIN_USER_NAME
export SECURITY_AUTH_DB_ADMIN_USER_PASSWORD=$SECURITY_AUTH_DB_ADMIN_USER_PASSWORD
export PROXY_SERVICE_TARGET_SUBDOMAIN=$PROXY_SUBDOMAIN
export PROXY_SERVICE_TARGET_PROXY=$EPS_PP_NAME
-export IRIS_BACKEND-SERVICE_ENDPOINT=$EPS_LS_NAME
+export IRIS_BACKEND_SERVICE_ENDPOINT=$EPS_LS_NAME
## Fixed Variables
export SPRING_PROFILES_ACTIVE=prod
diff --git a/iris-client-bff/pom.xml b/iris-client-bff/pom.xml
index 429e2ba12..70fde4b44 100644
--- a/iris-client-bff/pom.xml
+++ b/iris-client-bff/pom.xml
@@ -12,7 +12,7 @@
iris-gateway
iris-client-bff
- 1.1.0-POST_RELEASE
+ 1.1.1-POST_RELEASE
IRIS Client Backend for Frontend
Backend for frontend (BFF) of the client for the health departments. Communicates directly with the SORMAS of this department.
diff --git a/iris-client-bff/src/main/resources/messages.properties b/iris-client-bff/src/main/resources/messages.properties
index 5b3b9a4ab..fbc2de96a 100644
--- a/iris-client-bff/src/main/resources/messages.properties
+++ b/iris-client-bff/src/main/resources/messages.properties
@@ -1,5 +1,5 @@
EventDataReceivedEmail.subject=Neue Event Daten sind verfügbar auf dem IRIS Portal
CaseDataReceivedEmail.subject=Neue Indexfall Daten sind verfügbar auf dem IRIS Portal
-missing.property.iris.backend-service.endpoint=Über die Umgebungsvariable IRIS_BACKEND-SERVICE_ENDPOINT oder die entsprechende Property muss der Endpunkt des Backend-Service konfiguriert sein!
+missing.property.iris.backend-service.endpoint=Über die Umgebungsvariable IRIS_BACKEND_SERVICE_ENDPOINT oder die entsprechende Property muss der Endpunkt des Backend-Service konfiguriert sein!
UserController.username.notunique=Der Nutzername wird bereits verwendet!
UserController.oldpassword.wrong=Das bisherige Passwort stimmt nicht!
diff --git a/iris-client-bff/src/main/resources/messages_de.properties b/iris-client-bff/src/main/resources/messages_de.properties
index 5b3b9a4ab..fbc2de96a 100644
--- a/iris-client-bff/src/main/resources/messages_de.properties
+++ b/iris-client-bff/src/main/resources/messages_de.properties
@@ -1,5 +1,5 @@
EventDataReceivedEmail.subject=Neue Event Daten sind verfügbar auf dem IRIS Portal
CaseDataReceivedEmail.subject=Neue Indexfall Daten sind verfügbar auf dem IRIS Portal
-missing.property.iris.backend-service.endpoint=Über die Umgebungsvariable IRIS_BACKEND-SERVICE_ENDPOINT oder die entsprechende Property muss der Endpunkt des Backend-Service konfiguriert sein!
+missing.property.iris.backend-service.endpoint=Über die Umgebungsvariable IRIS_BACKEND_SERVICE_ENDPOINT oder die entsprechende Property muss der Endpunkt des Backend-Service konfiguriert sein!
UserController.username.notunique=Der Nutzername wird bereits verwendet!
UserController.oldpassword.wrong=Das bisherige Passwort stimmt nicht!
diff --git a/iris-client-bff/src/main/resources/messages_en.properties b/iris-client-bff/src/main/resources/messages_en.properties
index 5d514b917..b09df44e0 100644
--- a/iris-client-bff/src/main/resources/messages_en.properties
+++ b/iris-client-bff/src/main/resources/messages_en.properties
@@ -1,5 +1,5 @@
EventDataReceivedEmail.subject=New Event data is available in the IRIS portal
CaseDataReceivedEmail.subject=New Index Case data is available in the IRIS portal
-missing.property.iris.backend-service.endpoint=Via the environment variable IRIS_BACKEND-SERVICE_ENDPOINT or the corresponding property the endpoint of the backend service must be configured!
+missing.property.iris.backend-service.endpoint=Via the environment variable IRIS_BACKEND_SERVICE_ENDPOINT or the corresponding property the endpoint of the backend service must be configured!
UserController.username.notunique=The username is already used!
UserController.oldpassword.wrong=The previous password is not correct!
diff --git a/pom.xml b/pom.xml
index 070171f3e..8ffebf932 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
iris-gateway
parent
- 1.1.0-POST_RELEASE
+ 1.1.1-POST_RELEASE
pom
IRIS Parent