swedenconnect/eid-ops
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make URLs dynamic, SC-2670

Browse source
This commit is contained in:
Patrik Holmqvist 2025-02-19 16:31:28 +01:00
parent a1a8c1d240
commit 833714347c
Signed by: pahol
GPG key ID: 5D5B0D4E93F77273
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
global/overlay/etc/puppet/modules/eid/templates/connector/application-qa.yml.erb
View file

@ -75,17 +75,17 @@ credential:
health-endpoint-enabled: true health-endpoint-enabled: true
connector: connector:
domain: qa.connector.eidas.swedenconnect.se domain: <%= @environment %>.connector.eidas.swedenconnect.se
base-url: https://${connector.domain}${server.servlet.context-path} base-url: https://${connector.domain}${server.servlet.context-path}
backup-directory: ${CONNECTOR_DIRECTORY}/backup backup-directory: ${CONNECTOR_DIRECTORY}/backup
eu-metadata: eu-metadata:
location: https://qa.md.eidas.swedenconnect.se/role/idp.xml location: https://<%= @environment %>.md.eidas.swedenconnect.se/role/idp.xml
validation-certificate: file:${CONNECTOR_DIRECTORY}/credentials/metadata.crt validation-certificate: file:${CONNECTOR_DIRECTORY}/credentials/metadata.crt
prid: prid:
policy-resource: file:${CONNECTOR_DIRECTORY}/prid/policy.properties policy-resource: file:${CONNECTOR_DIRECTORY}/prid/policy.properties
idp: idp:
ping-whitelist: ping-whitelist:
- https://qa.test.swedenconnect.se/sp - https://<%= @environment %>.test.swedenconnect.se/sp
# idm: # idm:
# TODO: Change to true when IdM integration should be turned on # TODO: Change to true when IdM integration should be turned on
# active: false # active: false
@ -105,7 +105,7 @@ connector:
saml: saml:
idp: idp:
entity-id: https://qa.connector.eidas.swedenconnect.se/eidas entity-id: https://<%= @environment %>.connector.eidas.swedenconnect.se/eidas
base-url: ${connector.base-url} base-url: ${connector.base-url}
session: session:
module: <%= @session_backend %> module: <%= @session_backend %>
@ -113,7 +113,7 @@ saml:
type: <%= @session_backend %> type: <%= @session_backend %>
context: "connector-replay-cache" context: "connector-replay-cache"
metadata-providers: metadata-providers:
- location: https://qa.md.swedenconnect.se/role/sp.xml - location: https://<%= @environment %>.md.swedenconnect.se/role/sp.xml
backup-location: ${connector.backup-directory}/metadata/sc-cache.xml backup-location: ${connector.backup-directory}/metadata/sc-cache.xml
validation-certificate: file:${CONNECTOR_DIRECTORY}/credentials/metadata.crt validation-certificate: file:${CONNECTOR_DIRECTORY}/credentials/metadata.crt
credentials: credentials:

10
global/overlay/etc/puppet/modules/eid/templates/connector/application-test.yml.erb
View file

@ -98,17 +98,17 @@ credential:
health-endpoint-enabled: true health-endpoint-enabled: true
connector: connector:
domain: test.connector.eidas.swedenconnect.se domain: <%= @environment %>.connector.eidas.swedenconnect.se
base-url: https://${connector.domain}${server.servlet.context-path} base-url: https://${connector.domain}${server.servlet.context-path}
backup-directory: ${CONNECTOR_DIRECTORY}/backup backup-directory: ${CONNECTOR_DIRECTORY}/backup
eu-metadata: eu-metadata:
location: https://test.md.eidas.swedenconnect.se/role/idp.xml location: https://<%= @environment %>.md.eidas.swedenconnect.se/role/idp.xml
validation-certificate: file:${CONNECTOR_DIRECTORY}/credentials/sc-test-signer.crt validation-certificate: file:${CONNECTOR_DIRECTORY}/credentials/sc-test-signer.crt
prid: prid:
policy-resource: file:${CONNECTOR_DIRECTORY}/prid/policy.properties policy-resource: file:${CONNECTOR_DIRECTORY}/prid/policy.properties
idp: idp:
ping-whitelist: ping-whitelist:
- https://test.test.swedenconnect.se/sp - https://<%= @environment %>.test.swedenconnect.se/sp
# idm: # idm:
# TODO: Change to true when IdM integration should be turned on # TODO: Change to true when IdM integration should be turned on
# active: false # active: false
@ -128,7 +128,7 @@ connector:
saml: saml:
idp: idp:
entity-id: https://test.connector.eidas.swedenconnect.se/eidas entity-id: https://<%= @environment %>.connector.eidas.swedenconnect.se/eidas
base-url: ${connector.base-url} base-url: ${connector.base-url}
session: session:
module: <%= @session_backend %> module: <%= @session_backend %>
@ -136,7 +136,7 @@ saml:
type: <%= @session_backend %> type: <%= @session_backend %>
context: "connector-replay-cache" context: "connector-replay-cache"
metadata-providers: metadata-providers:
- location: https://test.md.swedenconnect.se/role/sp.xml - location: https://<%= @environment %>.md.swedenconnect.se/role/sp.xml
backup-location: ${connector.backup-directory}/metadata/sc-cache.xml backup-location: ${connector.backup-directory}/metadata/sc-cache.xml
validation-certificate: file:${CONNECTOR_DIRECTORY}/credentials/sc-test-signer.crt validation-certificate: file:${CONNECTOR_DIRECTORY}/credentials/sc-test-signer.crt
credentials: credentials: