From 603750e1316d8bf9c9f38be88d1c7c732c6d1e1f Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Tue, 11 Dec 2018 13:33:46 +0100
Subject: [PATCH] deploy ps 1.2.0 in qa

---
 ...pplication.properties => application-se.properties} | 10 +++++-----
 global/overlay/etc/puppet/cosmos-rules.yaml            |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/{application.properties => application-se.properties} (96%)

diff --git a/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/application.properties b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/application-se.properties
similarity index 96%
rename from eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/application.properties
rename to eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/application-se.properties
index 1d2260b3..7449329e 100644
--- a/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/application.properties
+++ b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/application-se.properties
@@ -2,7 +2,7 @@
 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}
@@ -95,9 +95,9 @@ proxy-service.nationalMetadata.qa.certFile=${proxy-service.path.prefix}/cfg/meta
 proxy-service.nationalMetadata.qa.cacheFile=${proxy-service.path.prefix}/cache/qa-metadata.xml
 proxy-service.nationalMetadata.qa.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
diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index 1db7aeb5..f603beb5 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -705,7 +705,7 @@ md-eu1.qa.komreg.net:
    autoupdate:
    servicemonitor:
    eidas_proxy:
-      version: 1.1.15
+      version: 1.2.0
       hostname: qa.proxy.eidas.swedenconnect.se
    sunet::frontend::register_sites:
      sites: