From 954d91049a962a0b09852a5370ebf9503c3b3dfa Mon Sep 17 00:00:00 2001
From: Maria Haider <mariah@nordu.net>
Date: Fri, 1 Apr 2022 18:39:30 +0200
Subject: [PATCH] validator prod rollback

---
 global/overlay/etc/puppet/cosmos-rules.yaml   |  2 +-
 .../etc/puppet/manifests/cosmos-site.pp       |  2 +-
 .../cfg/application.properties                | 31 ++++++++++---------
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index b93d3acc..12e14d2a 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -955,7 +955,7 @@ demw-2.sveidas.se:
    konsulter:
    autoupdate:
    validator:
-      version: 3.1.2
+      version: 3.0.10
    sunet::frontend::register_sites:
      sites:
        'validator.swedenconnect.se':
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index b8001be8..02114b7a 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -672,7 +672,7 @@ class validator($version="2.0.0") {
       volumes   => ['/etc/ssl:/etc/ssl',
                     '/etc/metadata-validator:/opt/webapp/mdval',
                     '/etc/localtime:/etc/localtime:ro'],
-      env       => ["SPRING_CONFIG_ADDITIONAL_LOCATION=/opt/webapp/mdval/cfg/",
+      env       => ["SPRING_CONFIG_LOCATION=/opt/webapp/mdval/cfg/",
                     "CERTNAME=${hostname}_infra"],
       extra_parameters => ["--log-driver=syslog"]
    }
diff --git a/validator-common/overlay/etc/metadata-validator/cfg/application.properties b/validator-common/overlay/etc/metadata-validator/cfg/application.properties
index ef1b8a6a..d484d014 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.servlet.context-path=/
-md-validator.path.prefix=${spring.config.additional-location}..
+server.context-path=/
+md-validator.path.prefix=${spring.config.location}..
 md-validator.domain.prefix=https://validator.swedenconnect.se/
 server.port=8443
 md-validator.daemon.recache.delay.sec=600
@@ -56,18 +56,19 @@ 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.secret=
+#tomcat.ajp.port=8009
+#tomcat.ajp.remoteauthentication=false
+#tomcat.ajp.enabled=false
 
 # Management
-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
+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}
+
+