From 1b59c905140962da92dcad5c2f60a4610760009a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Bergstro=CC=88m?= <berra@sunet.se>
Date: Fri, 1 Apr 2022 12:23:07 +0200
Subject: [PATCH] upgrade validator to 3.1.2 in QA

---
 global/overlay/etc/puppet/cosmos-rules.yaml   |  2 +-
 .../cfg/application.properties                | 23 +++++++++----------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index b4dd360f..a7b9e75d 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -1126,7 +1126,7 @@ log-1.sveidas.se:
    sunet_iaas_cloud:
    autoupdate:
    validator:
-      version: 3.0.10
+      version: 3.1.2
    sunet::frontend::register_sites:
      sites:
        'swedenconnect.se':
diff --git a/validator-1.qa.komreg.net/overlay/etc/metadata-validator/cfg/application.properties b/validator-1.qa.komreg.net/overlay/etc/metadata-validator/cfg/application.properties
index d74ce1c7..32dab135 100644
--- a/validator-1.qa.komreg.net/overlay/etc/metadata-validator/cfg/application.properties
+++ b/validator-1.qa.komreg.net/overlay/etc/metadata-validator/cfg/application.properties
@@ -1,6 +1,6 @@
 # Main service configurations
-server.context-path=/metadata-validator
-md-validator.path.prefix=${spring.config.location}..
+server.servlet.context-path=/metadata-validator
+md-validator.path.prefix=${spring.config.additional-location}..
 md-validator.domain.prefix=https://swedenconnect.se/metadata-validator/
 server.port=8443
 md-validator.daemon.recache.delay.sec=600
@@ -61,14 +61,13 @@ md-validator.federationOrder[2]=sandbox
 #tomcat.ajp.enabled=false
 
 # Management
-management.context-path=/manage
-management.security.enabled=false
-management.port=8008
-#management.ssl.enabled=true
-#management.ssl.key-store=${server.ssl.key-store}
-#management.ssl.key-store-password=${server.ssl.key-store-password}
-#management.ssl.key-password=${server.ssl.key-password}
-#management.ssl.key-store-type=${server.ssl.key-store-type}
-#management.ssl.key-alias=${server.ssl.key-alias}
-
+management.server.base-path=/manage
+management.server.port=8008
+management.server.ssl.enabled=false
+management.endpoint.info.enabled=true
+management.endpoint.health.enabled=true
+management.endpoint.auditevents.enabled=true
+management.endpoints.web.exposure.include=*
+management.endpoints.web.base-path=/
+management.endpoint.health.show-details=always