From 74fbf74934ed9c551037400b4ffd9966777d5aa7 Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Fri, 24 Mar 2023 15:58:54 +0100 Subject: [PATCH] fixed some more URLs --- .../overlay/etc/eidas-connector/eidas-connector.conf | 2 +- .../overlay/etc/eidas-connector/eidas-connector.conf | 2 +- .../overlay/etc/eidas-connector/eidas-connector.conf | 2 +- eumd-common/overlay/etc/mirror-mdq/template/index.html | 2 +- global/overlay/etc/puppet/manifests/cosmos-site.pp | 6 +++--- md1.komreg.net/overlay/etc/mirror-mdq/template/index.html | 2 +- natmd-common/overlay/etc/mirror-mdq/template/index.html | 2 +- .../overlay/etc/mirror-mdq/template/index.html | 2 +- .../etc/metadata-validator/cfg/application.properties | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eidas-connector-common/overlay/etc/eidas-connector/eidas-connector.conf b/eidas-connector-common/overlay/etc/eidas-connector/eidas-connector.conf index ab4c5b50..467e3aab 100644 --- a/eidas-connector-common/overlay/etc/eidas-connector/eidas-connector.conf +++ b/eidas-connector-common/overlay/etc/eidas-connector/eidas-connector.conf @@ -80,7 +80,7 @@ export TOMCAT_TLS_SERVER_KEY=$TOMCAT_CREDENTIALS/tomcat-key.pem export TOMCAT_TLS_SERVER_CERTIFICATE=$TOMCAT_CREDENTIALS/tomcat-cert.pem export TOMCAT_TLS_SERVER_CERTIFICATE_CHAIN=$TOMCAT_CREDENTIALS/tomcat-chain.pem -export FEDERATION_METADATA_URL=https://md.swedenconnect.se/entities +export FEDERATION_METADATA_URL=https://md.swedenconnect.se/entities/ export FEDERATION_METADATA_VALIDATION_CERT=/etc/eidas-connector/credentials/swedenconnect-signer.crt unset EIDAS_METADATA_SERVICE_LIST_URL=https://md.eidas.swedenconnect.se/mdservicelist-aggregate.xml diff --git a/eidas-qa-connector/overlay/etc/eidas-connector/eidas-connector.conf b/eidas-qa-connector/overlay/etc/eidas-connector/eidas-connector.conf index 757bd97f..65a7eb81 100644 --- a/eidas-qa-connector/overlay/etc/eidas-connector/eidas-connector.conf +++ b/eidas-qa-connector/overlay/etc/eidas-connector/eidas-connector.conf @@ -75,7 +75,7 @@ unset EIDAS_METADATA_SERVICE_LIST_URL #export EIDAS_METADATA_SERVICE_LIST_VALIDATION_CERT=/etc/eidas-connector/credentials/metadata.crt unset EIDAS_METADATA_SERVICE_LIST_VALIDATION_CERT -export EIDAS_METADATA_URL=https://qa.md.eidas.swedenconnect.se/entities +export EIDAS_METADATA_URL=https://qa.md.eidas.swedenconnect.se/entities/ export EIDAS_METADATA_VALIDATION_CERT=/etc/eidas-connector/credentials/metadata.crt export IDP_ACCESSIBILITY_URL=https://www.swedenconnect.se/om/om-webbplatsen/tillganglighet/svenska-eidas-noden diff --git a/eidas-test-connector/overlay/etc/eidas-connector/eidas-connector.conf b/eidas-test-connector/overlay/etc/eidas-connector/eidas-connector.conf index ed2fa8c5..e4c57e32 100644 --- a/eidas-test-connector/overlay/etc/eidas-connector/eidas-connector.conf +++ b/eidas-test-connector/overlay/etc/eidas-connector/eidas-connector.conf @@ -80,7 +80,7 @@ export TOMCAT_TLS_SERVER_KEY=$TOMCAT_CREDENTIALS/tomcat-key.pem export TOMCAT_TLS_SERVER_CERTIFICATE=$TOMCAT_CREDENTIALS/tomcat-cert.pem export TOMCAT_TLS_SERVER_CERTIFICATE_CHAIN=$TOMCAT_CREDENTIALS/tomcat-chain.pem -export FEDERATION_METADATA_URL=https://test.md.swedenconnect.se/entities +export FEDERATION_METADATA_URL=https://test.md.swedenconnect.se/entities/ export FEDERATION_METADATA_VALIDATION_CERT=/etc/eidas-connector/credentials/test-metadata-signer.crt unset EIDAS_METADATA_SERVICE_LIST_URL=https://test.md.eidas.swedenconnect.se/mdservicelist-aggregate.xml diff --git a/eumd-common/overlay/etc/mirror-mdq/template/index.html b/eumd-common/overlay/etc/mirror-mdq/template/index.html index 62428012..414a2341 100644 --- a/eumd-common/overlay/etc/mirror-mdq/template/index.html +++ b/eumd-common/overlay/etc/mirror-mdq/template/index.html @@ -80,7 +80,7 @@ j6+cBKFT97et/lUMyfKVwbmuJNgtABRRcw==

SAML Metadata URLs

All Entities
-
https://md.eidas.swedenconnect.se/entities
+
https://md.eidas.swedenconnect.se/entities/
Only IdPs
https://md.eidas.swedenconnect.se/role/idp.xml
Only SPs
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index b71ba0c1..16398e5e 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -537,7 +537,7 @@ class swedenconnect_refidp($version="1.0.3",$hostname='localhost',$env=undef) { '/etc/ssl:/etc/ssl'], env => ["IDP_SERVER_HOSTNAME=$_hostname", "TOMCAT_HOSTNAME=$_hostname", - "IDP_FEDERATION_METADATA_URL=https://${env}.md.swedenconnect.se/entities", + "IDP_FEDERATION_METADATA_URL=https://${env}.md.swedenconnect.se/entities/", "IDP_FEDERATION_METADATA_VALIDATION_CERT=/etc/swedenconnect-idp/credentials/trust/sc-${env}-metadata-validation-cert.crt", "TOMCAT_TLS_SERVER_KEY=/etc/ssl/private/${::fqdn}_infra.key", "TOMCAT_TLS_SERVER_CERTIFICATE=/etc/ssl/certs/${::fqdn}_infra.crt", @@ -1413,7 +1413,7 @@ class nagios_monitor { $hosts_md.each |$host|{ nagioscfg::service {"check_metadata_age_${host}": host_name => ["${host}"], - check_command => "check_metadata_age!https://${host}/entities!691200!172800", + check_command => "check_metadata_age!https://${host}/entities/!691200!172800", description => "check metadata for ${host}", contact_groups => ['alerts'], } @@ -1422,7 +1422,7 @@ class nagios_monitor { $hosts_md_eidas.each |$host|{ nagioscfg::service {"check_metadata_age_${host}": host_name => ["${host}"], - check_command => "check_metadata_age!https://${host}/entities!432000!86400", + check_command => "check_metadata_age!https://${host}/entities/!432000!86400", description => "check metadata for ${host}", contact_groups => ['alerts'], } diff --git a/md1.komreg.net/overlay/etc/mirror-mdq/template/index.html b/md1.komreg.net/overlay/etc/mirror-mdq/template/index.html index 1c62ad79..10a48e46 100644 --- a/md1.komreg.net/overlay/etc/mirror-mdq/template/index.html +++ b/md1.komreg.net/overlay/etc/mirror-mdq/template/index.html @@ -79,7 +79,7 @@ JERf83JkjVLanESP9/U9nsZYgIiSX88PahYtuSZLhqamzzFvK+wuVcNKark8s1kS

Metadata URLer

Full metadata - samtliga objekt
-
https://qa.md.swedenconnect.se/entities
+
https://qa.md.swedenconnect.se/entities/
Endast IdP:er
https://qa.md.swedenconnect.se/role/idp.xml
Endast SP:er
diff --git a/natmd-common/overlay/etc/mirror-mdq/template/index.html b/natmd-common/overlay/etc/mirror-mdq/template/index.html index 01318f5a..7c10b977 100644 --- a/natmd-common/overlay/etc/mirror-mdq/template/index.html +++ b/natmd-common/overlay/etc/mirror-mdq/template/index.html @@ -80,7 +80,7 @@ j6+cBKFT97et/lUMyfKVwbmuJNgtABRRcw==

Metadata URLer

Full metadata - samtliga objekt
-
https://md.swedenconnect.se/entities
+
https://md.swedenconnect.se/entities/
Endast IdP:er
https://md.swedenconnect.se/role/idp.xml
Endast SP:er
diff --git a/natmd-test-common/overlay/etc/mirror-mdq/template/index.html b/natmd-test-common/overlay/etc/mirror-mdq/template/index.html index 3fdf60c3..af291c9e 100644 --- a/natmd-test-common/overlay/etc/mirror-mdq/template/index.html +++ b/natmd-test-common/overlay/etc/mirror-mdq/template/index.html @@ -79,7 +79,7 @@ W3H4unQMgNcLSYEAjclVYqNmV82EaX2R1TuF5oVyI9PSunNxHTyBQQ==

Metadata URLer

Full metadata - samtliga objekt
-
https://test.md.swedenconnect.se/entities
+
https://test.md.swedenconnect.se/entities/
Endast IdP:er
https://test.md.swedenconnect.se/role/idp.xml
Endast SP:er
diff --git a/validator-1.qa.komreg.net/overlay/etc/metadata-validator/cfg/application.properties b/validator-1.qa.komreg.net/overlay/etc/metadata-validator/cfg/application.properties index e9237759..90a4f987 100644 --- a/validator-1.qa.komreg.net/overlay/etc/metadata-validator/cfg/application.properties +++ b/validator-1.qa.komreg.net/overlay/etc/metadata-validator/cfg/application.properties @@ -15,7 +15,7 @@ md-validator.home.url=https://swedenconnect.se # Multipple sources may be set ordered by index. Valid parameters are "location", "certFile" (optional), # "cacheFile" (optional), "index" and "ignoreSignatureValidation" default false. -md-validator.metadataSource.prod[0].location=https://md.swedenconnect.se/entities +md-validator.metadataSource.prod[0].location=https://md.swedenconnect.se/entities/ md-validator.metadataSource.prod[0].certFile=${md-validator.path.prefix}/cert/sc-prod-md.crt md-validator.metadataSource.prod[0].cacheFile=${md-validator.path.prefix}/mdcache/prod-metadata-cache.xml md-validator.metadataSource.prod[0].index=0