From 1984295766bd3983909a8131ebf37ddfa7e8a77e Mon Sep 17 00:00:00 2001
From: Patrik Holmqvist <pahol@sunet.se>
Date: Thu, 20 Mar 2025 14:56:57 +0100
Subject: [PATCH] Update test-my-eid config for QA to align with TEST, SC-2873

---
 .../test_my_eid/application-qa.yml.erb        | 30 +++++++++++++------
 .../test_my_eid/application-test.yml.erb      |  1 -
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/global/overlay/etc/puppet/modules/eid/templates/test_my_eid/application-qa.yml.erb b/global/overlay/etc/puppet/modules/eid/templates/test_my_eid/application-qa.yml.erb
index 3d1087f1..e9a2516c 100644
--- a/global/overlay/etc/puppet/modules/eid/templates/test_my_eid/application-qa.yml.erb
+++ b/global/overlay/etc/puppet/modules/eid/templates/test_my_eid/application-qa.yml.erb
@@ -1,11 +1,24 @@
 ---
+spring:
+  ssl:
+    bundle:
+      pem:
+        test-my-eid-web-server:
+          keystore:
+            certificate: file:/etc/ssl/certs/<%= @server_fqdn %>_infra.crt
+            private-key: file:/etc/ssl/private/<%= @server_fqdn %>_infra.key
 credential:
   bundles:
     keystore:
       sp-keys-store:
-        location: file:${SP_CONFIG_DIRECTORY}/credentials/sp-keys.jks
+        location: file:${SP_CONFIG_DIRECTORY}/credentials/testmyeid-qa-sp-keys.jks
         type: JKS
         password: secret
+      sp-metadata-store:
+        location: file:${SP_CONFIG_DIRECTORY}/credentials/testmyeid-qa-md-sign.jks
+        type: JKS
+        password: secret
+
     jks:
       sp-sign:
         name: sp-sign-key
@@ -21,10 +34,7 @@ credential:
           key-password: secret
       sp-md-sign:
         name: sp-metadata-sign
-        store:
-          location: file:${SP_CONFIG_DIRECTORY}/credentials/metadata-sign.jks
-          type: JKS
-          password: secret
+        store-reference: sp-metadata-store
         key:
           alias: mdsign
           key-password: secret
@@ -35,12 +45,14 @@ server:
     session:
       cookie:
         domain: qa.test.swedenconnect.se
-
+  ssl:
+    enabled: true
+    bundle: test-my-eid-web-server
 
 sp:
   base-uri: https://qa.test.swedenconnect.se
-  entity-id: https://qa.test.swedenconnect.se/testmyeid
-  sign-entity-id: http://qa.swedenconnect.se/testmyeid-sign
+  entity-id: https://qa.test.swedenconnect.se/sp
+  sign-entity-id: https://qa.swedenconnect.se/sp-sign
   credential:
     sign:
       bundle: sp-sign
@@ -57,7 +69,7 @@ sp:
   federation:
     metadata:
       url: https://qa.md.swedenconnect.se/role/idp.xml
-      validation-certificate: file:${SP_CONFIG_DIRECTORY}/sc-qa-metadata.crt
+      validation-certificate: file:${SP_CONFIG_DIRECTORY}/credentials/sc-qa-md-signer.crt
   security:
     algorithm-config:
       use-aes-gcm: true
diff --git a/global/overlay/etc/puppet/modules/eid/templates/test_my_eid/application-test.yml.erb b/global/overlay/etc/puppet/modules/eid/templates/test_my_eid/application-test.yml.erb
index b5a332a1..2d6d8f48 100644
--- a/global/overlay/etc/puppet/modules/eid/templates/test_my_eid/application-test.yml.erb
+++ b/global/overlay/etc/puppet/modules/eid/templates/test_my_eid/application-test.yml.erb
@@ -49,7 +49,6 @@ server:
     enabled: true
     bundle: test-my-eid-web-server
 
-
 sp:
   base-uri: https://test.test.swedenconnect.se
   entity-id: https://test.test.swedenconnect.se/sp