From 98cdb8d9836f5a91310491035a6c9c7297d04744 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Mon, 1 Jun 2020 11:24:40 +0200
Subject: [PATCH] fix for 1.3.4 upgrade
---
...on.properties => application-se.properties} | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
rename eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/{application.properties => application-se.properties} (88%)
diff --git a/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/application.properties b/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/application-se.properties
similarity index 88%
rename from eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/application.properties
rename to eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/application-se.properties
index 2c65fe11..174df518 100644
--- a/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/application.properties
+++ b/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/application-se.properties
@@ -2,13 +2,13 @@
logging.level.org.springframework.web=INFO
# Service path
-server.context-path=/eidas-ps
+server.servlet.context-path=/eidas-ps
-proxy-service.path.prefix=${spring.config.location}..
-proxy-service.config.location=file://${spring.config.location}
+#proxy-service.path.prefix=${spring.config.additional.location}..
+#proxy-service.config.location=file://${spring.config.additional.location}
-proxy-service.image.logo=${spring.config.location}/img/sweden-connect-color-yellow-on-blue.svg
-proxy-service.image.icon=${spring.config.location}/img/sweden-connect-color-yellow-on-blue-no-text.svg
+proxy-service.image.logo=${spring.config.additional.location}/img/sweden-connect-color-yellow-on-blue.svg
+proxy-service.image.icon=${spring.config.additional.location}/img/sweden-connect-color-yellow-on-blue-no-text.svg
# Service port connector settings
server.port=8443
@@ -94,9 +94,9 @@ proxy-service.nationalMetadata.prod.certFile=${proxy-service.path.prefix}/cfg/sw
proxy-service.nationalMetadata.prod.cacheFile=${proxy-service.path.prefix}/cache/prod-metadata.xml
proxy-service.nationalMetadata.prod.index=0
-management.context-path=/manage
-management.security.enabled=false
-management.port=8444
-management.ssl.enabled=true
+management.server.context-path=/manage
+management.server.security.enabled=false
+management.server.port=8444
+management.server.ssl.enabled=true
proxy-service.syslog.enabled=true