fixed some more URLs
This commit is contained in:
parent
09ec72acd9
commit
74fbf74934
9 changed files with 11 additions and 11 deletions
|
@ -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=$TOMCAT_CREDENTIALS/tomcat-cert.pem
|
||||||
export TOMCAT_TLS_SERVER_CERTIFICATE_CHAIN=$TOMCAT_CREDENTIALS/tomcat-chain.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
|
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
|
unset EIDAS_METADATA_SERVICE_LIST_URL=https://md.eidas.swedenconnect.se/mdservicelist-aggregate.xml
|
||||||
|
|
|
@ -75,7 +75,7 @@ unset EIDAS_METADATA_SERVICE_LIST_URL
|
||||||
#export EIDAS_METADATA_SERVICE_LIST_VALIDATION_CERT=/etc/eidas-connector/credentials/metadata.crt
|
#export EIDAS_METADATA_SERVICE_LIST_VALIDATION_CERT=/etc/eidas-connector/credentials/metadata.crt
|
||||||
unset EIDAS_METADATA_SERVICE_LIST_VALIDATION_CERT
|
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 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
|
export IDP_ACCESSIBILITY_URL=https://www.swedenconnect.se/om/om-webbplatsen/tillganglighet/svenska-eidas-noden
|
||||||
|
|
|
@ -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=$TOMCAT_CREDENTIALS/tomcat-cert.pem
|
||||||
export TOMCAT_TLS_SERVER_CERTIFICATE_CHAIN=$TOMCAT_CREDENTIALS/tomcat-chain.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
|
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
|
unset EIDAS_METADATA_SERVICE_LIST_URL=https://test.md.eidas.swedenconnect.se/mdservicelist-aggregate.xml
|
||||||
|
|
|
@ -80,7 +80,7 @@ j6+cBKFT97et/lUMyfKVwbmuJNgtABRRcw==
|
||||||
<h2>SAML Metadata URLs</h2>
|
<h2>SAML Metadata URLs</h2>
|
||||||
<dl>
|
<dl>
|
||||||
<dt>All Entities</dt>
|
<dt>All Entities</dt>
|
||||||
<dd><a href="/entities/">https://md.eidas.swedenconnect.se/entities</a></dd>
|
<dd><a href="/entities/">https://md.eidas.swedenconnect.se/entities/</a></dd>
|
||||||
<dt>Only IdPs</dt>
|
<dt>Only IdPs</dt>
|
||||||
<dd><a href="/role/idp.xml">https://md.eidas.swedenconnect.se/role/idp.xml</a></dd>
|
<dd><a href="/role/idp.xml">https://md.eidas.swedenconnect.se/role/idp.xml</a></dd>
|
||||||
<dt>Only SPs</dt>
|
<dt>Only SPs</dt>
|
||||||
|
|
|
@ -537,7 +537,7 @@ class swedenconnect_refidp($version="1.0.3",$hostname='localhost',$env=undef) {
|
||||||
'/etc/ssl:/etc/ssl'],
|
'/etc/ssl:/etc/ssl'],
|
||||||
env => ["IDP_SERVER_HOSTNAME=$_hostname",
|
env => ["IDP_SERVER_HOSTNAME=$_hostname",
|
||||||
"TOMCAT_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",
|
"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_KEY=/etc/ssl/private/${::fqdn}_infra.key",
|
||||||
"TOMCAT_TLS_SERVER_CERTIFICATE=/etc/ssl/certs/${::fqdn}_infra.crt",
|
"TOMCAT_TLS_SERVER_CERTIFICATE=/etc/ssl/certs/${::fqdn}_infra.crt",
|
||||||
|
@ -1413,7 +1413,7 @@ class nagios_monitor {
|
||||||
$hosts_md.each |$host|{
|
$hosts_md.each |$host|{
|
||||||
nagioscfg::service {"check_metadata_age_${host}":
|
nagioscfg::service {"check_metadata_age_${host}":
|
||||||
host_name => ["${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}",
|
description => "check metadata for ${host}",
|
||||||
contact_groups => ['alerts'],
|
contact_groups => ['alerts'],
|
||||||
}
|
}
|
||||||
|
@ -1422,7 +1422,7 @@ class nagios_monitor {
|
||||||
$hosts_md_eidas.each |$host|{
|
$hosts_md_eidas.each |$host|{
|
||||||
nagioscfg::service {"check_metadata_age_${host}":
|
nagioscfg::service {"check_metadata_age_${host}":
|
||||||
host_name => ["${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}",
|
description => "check metadata for ${host}",
|
||||||
contact_groups => ['alerts'],
|
contact_groups => ['alerts'],
|
||||||
}
|
}
|
||||||
|
|
|
@ -79,7 +79,7 @@ JERf83JkjVLanESP9/U9nsZYgIiSX88PahYtuSZLhqamzzFvK+wuVcNKark8s1kS
|
||||||
<h2>Metadata URLer</h2>
|
<h2>Metadata URLer</h2>
|
||||||
<dl>
|
<dl>
|
||||||
<dt>Full metadata - samtliga objekt</dt>
|
<dt>Full metadata - samtliga objekt</dt>
|
||||||
<dd><a href="/entities/">https://qa.md.swedenconnect.se/entities</a></dd>
|
<dd><a href="/entities/">https://qa.md.swedenconnect.se/entities/</a></dd>
|
||||||
<dt>Endast IdP:er</dt>
|
<dt>Endast IdP:er</dt>
|
||||||
<dd><a href="/role/idp.xml">https://qa.md.swedenconnect.se/role/idp.xml</a></dd>
|
<dd><a href="/role/idp.xml">https://qa.md.swedenconnect.se/role/idp.xml</a></dd>
|
||||||
<dt>Endast SP:er</dt>
|
<dt>Endast SP:er</dt>
|
||||||
|
|
|
@ -80,7 +80,7 @@ j6+cBKFT97et/lUMyfKVwbmuJNgtABRRcw==
|
||||||
<h2>Metadata URLer</h2>
|
<h2>Metadata URLer</h2>
|
||||||
<dl>
|
<dl>
|
||||||
<dt>Full metadata - samtliga objekt</dt>
|
<dt>Full metadata - samtliga objekt</dt>
|
||||||
<dd><a href="/entities/">https://md.swedenconnect.se/entities</a></dd>
|
<dd><a href="/entities/">https://md.swedenconnect.se/entities/</a></dd>
|
||||||
<dt>Endast IdP:er</dt>
|
<dt>Endast IdP:er</dt>
|
||||||
<dd><a href="/role/idp.xml">https://md.swedenconnect.se/role/idp.xml</a></dd>
|
<dd><a href="/role/idp.xml">https://md.swedenconnect.se/role/idp.xml</a></dd>
|
||||||
<dt>Endast SP:er</dt>
|
<dt>Endast SP:er</dt>
|
||||||
|
|
|
@ -79,7 +79,7 @@ W3H4unQMgNcLSYEAjclVYqNmV82EaX2R1TuF5oVyI9PSunNxHTyBQQ==
|
||||||
<h2>Metadata URLer</h2>
|
<h2>Metadata URLer</h2>
|
||||||
<dl>
|
<dl>
|
||||||
<dt>Full metadata - samtliga objekt</dt>
|
<dt>Full metadata - samtliga objekt</dt>
|
||||||
<dd><a href="/entities/">https://test.md.swedenconnect.se/entities</a></dd>
|
<dd><a href="/entities/">https://test.md.swedenconnect.se/entities/</a></dd>
|
||||||
<dt>Endast IdP:er</dt>
|
<dt>Endast IdP:er</dt>
|
||||||
<dd><a href="/role/idp.xml">https://test.md.swedenconnect.se/role/idp.xml</a></dd>
|
<dd><a href="/role/idp.xml">https://test.md.swedenconnect.se/role/idp.xml</a></dd>
|
||||||
<dt>Endast SP:er</dt>
|
<dt>Endast SP:er</dt>
|
||||||
|
|
|
@ -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),
|
# Multipple sources may be set ordered by index. Valid parameters are "location", "certFile" (optional),
|
||||||
# "cacheFile" (optional), "index" and "ignoreSignatureValidation" default false.
|
# "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].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].cacheFile=${md-validator.path.prefix}/mdcache/prod-metadata-cache.xml
|
||||||
md-validator.metadataSource.prod[0].index=0
|
md-validator.metadataSource.prod[0].index=0
|
||||||
|
|
Loading…
Add table
Reference in a new issue