From 1bdef91fb19e632d1d5946772e72fa89f709a92a Mon Sep 17 00:00:00 2001
From: Maria Haider <mariah@nordu.net>
Date: Fri, 1 Apr 2022 18:09:45 +0200
Subject: [PATCH] Upgrading validator in PROD

Ref: SC-873
---
 global/overlay/etc/puppet/cosmos-rules.yaml   |  4 +--
 .../cfg/application.properties                | 29 +++++++++----------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index bd3f13aa..b93d3acc 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -813,7 +813,7 @@ test-1.test.sveidas.se:
    konsulter:
    autoupdate:
    eidas_de_middleware:
-      version: 226-sc-p11-rce
+      version: 226-sc-p11-rce_hsm2
       hostname: qa.demw.eidas.swedenconnect.se
    saml_metadata:
       filename: /opt/eidas-middleware/configuration/serviceprovider-metadata/connector-metadata.xml
@@ -955,7 +955,7 @@ demw-2.sveidas.se:
    konsulter:
    autoupdate:
    validator:
-      version: 3.0.10
+      version: 3.1.2
    sunet::frontend::register_sites:
      sites:
        'validator.swedenconnect.se':
diff --git a/validator-common/overlay/etc/metadata-validator/cfg/application.properties b/validator-common/overlay/etc/metadata-validator/cfg/application.properties
index d484d014..f4e6c464 100644
--- a/validator-common/overlay/etc/metadata-validator/cfg/application.properties
+++ b/validator-common/overlay/etc/metadata-validator/cfg/application.properties
@@ -1,6 +1,6 @@
 # Main service configurations
 server.context-path=/
-md-validator.path.prefix=${spring.config.location}..
+md-validator.path.prefix=${spring.config.additional-location}..
 md-validator.domain.prefix=https://validator.swedenconnect.se/
 server.port=8443
 md-validator.daemon.recache.delay.sec=600
@@ -56,19 +56,18 @@ md-validator.federationOrder[2]=sandbox
 #server.ssl.key-store-password=secret
 #server.ssl.key-password=secret
 
-#tomcat.ajp.port=8009
-#tomcat.ajp.remoteauthentication=false
-#tomcat.ajp.enabled=false
+tomcat.ajp.port=8009
+tomcat.ajp.remoteauthentication=false
+tomcat.ajp.enabled=false
+tomcat.ajp.secret=
 
 # 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