From a3fb9dca52deae027f6b790da6684db0f1a252f3 Mon Sep 17 00:00:00 2001
From: Johan Wassberg <jocar@sunet.se>
Date: Tue, 4 Jun 2024 14:31:32 +0200
Subject: [PATCH] Variable configuration
---
.../etc/puppet/modules/eid/templates/idm/idm.yml.erb | 10 +++++-----
idm-qa-common/overlay/etc/hiera/data/group.yaml | 5 +++++
idm-test-common/overlay/etc/hiera/data/group.yaml | 6 ++++++
3 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/global/overlay/etc/puppet/modules/eid/templates/idm/idm.yml.erb b/global/overlay/etc/puppet/modules/eid/templates/idm/idm.yml.erb
index 618cdb0c..da5c7942 100644
--- a/global/overlay/etc/puppet/modules/eid/templates/idm/idm.yml.erb
+++ b/global/overlay/etc/puppet/modules/eid/templates/idm/idm.yml.erb
@@ -83,7 +83,7 @@ idm:
# XXX fix OAUTH
mrecord:
api:
- connector-id: https://test.idm.eidas.swedenconnect.se/connector
+ connector-id: <%= scope.call_function('safe_hiera', ['connector_id']) %>
check-scope: ${idm.oauth2-id}/idrecord_check
get-scope: ${idm.oauth2-id}/idrecord_get
db:
@@ -93,9 +93,9 @@ idm:
key-alias: dbkey
key-password: secret
auth:
- destination-url: https://sandbox.swedenconnect.se/auth/be/auth # Id-Tjänsten
- auth-return-url: https://test.idm.eidas.swedenconnect.se:443/auth/sp/return
- discover-return-url: https://test.idm.eidas.swedenconnect.se:443/auth/sign/sp/return
+ destination-url: <%= scope.call_function('safe_hiera', ['destination_url']) %>
+ auth-return-url: <%= scope.call_function('safe_hiera', ['auth_return_url']) %>
+ discover-return-url: <%= scope.call_function('safe_hiera', ['discover_return_url']) %>
client-id: <%= scope.call_function('safe_hiera', ['client_id']) %>
trusted-certificates:
- classpath:idp.cert
@@ -108,7 +108,7 @@ idm:
no-reply-email: noreply@swedenconnect.se
storage:
pending-relative-sign-time-to-live-in-hours: 336
- oauth2-id: https://test.idm.swedenconnect.se
+ oauth2-id: <%= scope.call_function('safe_hiera', ['oauth2_id']) %>
signservice:
diff --git a/idm-qa-common/overlay/etc/hiera/data/group.yaml b/idm-qa-common/overlay/etc/hiera/data/group.yaml
index 1db0c044..68c2245f 100644
--- a/idm-qa-common/overlay/etc/hiera/data/group.yaml
+++ b/idm-qa-common/overlay/etc/hiera/data/group.yaml
@@ -12,3 +12,8 @@ redis_cluster_nodes:
- 89.47.185.71
client_id: digg-idm-sunet-qa
smtp_user: idm_qa@swedenconnect.se
+connector_id: https://qa.idm.eidas.swedenconnect.se/connector
+destination_url: https://sandbox.swedenconnect.se/auth/be/auth
+auth_return_url: https://qa.idm.eidas.swedenconnect.se:443/auth/sp/return
+discover_return_url: https://qa.idm.eidas.swedenconnect.se:443/auth/sign/sp/return
+oauth2_id: https://qa.idm.swedenconnect.se
diff --git a/idm-test-common/overlay/etc/hiera/data/group.yaml b/idm-test-common/overlay/etc/hiera/data/group.yaml
index 687e7465..6a45437a 100644
--- a/idm-test-common/overlay/etc/hiera/data/group.yaml
+++ b/idm-test-common/overlay/etc/hiera/data/group.yaml
@@ -11,3 +11,9 @@ redis_cluster_nodes:
- 89.45.236.157
client_id: digg-idm-sunet-qa
smtp_user: idm_test@swedenconnect.se
+
+connector_id: https://test.idm.eidas.swedenconnect.se/connector
+destination_url: https://sandbox.swedenconnect.se/auth/be/auth
+auth_return_url: https://test.idm.eidas.swedenconnect.se:443/auth/sp/return
+discover_return_url: https://test.idm.eidas.swedenconnect.se:443/auth/sign/sp/return
+oauth2_id: https://test.idm.swedenconnect.se