diff options
| author | Björn Mattsson <bjorn@sunet.se> | 2023-07-27 14:25:40 +0200 |
|---|---|---|
| committer | Björn Mattsson <bjorn@sunet.se> | 2023-07-27 14:25:40 +0200 |
| commit | 6abd61d751ad6235eb4263137521e6a68f6f49de (patch) | |
| tree | ca9c1c6967b6f518ffa237c77821048bb389403c | |
| parent | a71115b7410bf8df127fafff27a59f52a12b8b8e (diff) | |
Fixed fidus-prod.fd for pyff-2.0fidus-metadata-2023-07-27-v01
| -rw-r--r-- | metadata/acceptedSPs | 4 | ||||
| -rw-r--r-- | metadata/fidus-prod.fd | 27 | ||||
| -rw-r--r-- | metadata/fidus-test.fd | 6 |
3 files changed, 14 insertions, 23 deletions
diff --git a/metadata/acceptedSPs b/metadata/acceptedSPs index 4c7b6ea..8eb2233 100644 --- a/metadata/acceptedSPs +++ b/metadata/acceptedSPs @@ -12,3 +12,7 @@ https://vfusyd-test.su.se/Shibboleth.sso https://betyg.test.uhr.se/beda-inrapportering https://betyg.uhr.se/beda-inrapportering https://otc-skol-uat-sso.am.rm.com/module.php/saml/sp/metadata.php/sp1 +https://skolverket.eduid.se/dnp/sp/ +https://otc-skol-int-sso.am.rm.com/module.php/saml/sp/metadata.php/sp1 +https://otc-skol-live-sso.am.rm.com/module.php/saml/sp/metadata.php/sp1 +https://otc-skol-utb-sso.am.rm.com/module.php/saml/sp/metadata.php/sp1 diff --git a/metadata/fidus-prod.fd b/metadata/fidus-prod.fd index 5c2451d..e1d0b0e 100644 --- a/metadata/fidus-prod.fd +++ b/metadata/fidus-prod.fd @@ -9,28 +9,16 @@ stylesheet: tidy.xsl - check_xml_namespaces - break -- when remote: - - xslt: - stylesheet: tidy.xsl - - filter: - - "!//md:EntityDescriptor[md:IDPSSODescriptor]" - - https://humhub-idp-proxy.sunet.se/sp - - https://idpproxy.dev.eduid.se/sp - - https://vfu-test.su.se/Shibboleth.sso - - https://vfusyd-test.su.se/Shibboleth.sso - - https://betyg.test.uhr.se/beda-inrapportering - - https://betyg.uhr.se/beda-inrapportering - - break - when update: - load: - - https://mds.swamid.se/md/swamid-registered.xml cleanup remote - - https://md.swefed.se/skolfederation/idp.xml cleanup remote + - /opt/metadata/swamid cleanup clean + - /opt/metadata/skolfederation cleanup clean - /opt/metadata/test-sp cleanup clean via local - /opt/metadata/production-idp cleanup clean via local - /opt/metadata/production-sp cleanup clean via local - select - fork: - - select as /downstream: + - select as downstream: - https://fidustest.skolverket.se/shibboleth - https://sso.skolverket.sonet.com.au/module.php/saml/sp/metadata.php/sp1 - https://sso.am.uat.skolverket.sonet.com.au/module.php/saml/sp/metadata.php/sp1 @@ -51,10 +39,10 @@ - https://otc-skol-utb-sso.am.rm.com/module.php/saml/sp/metadata.php/sp1 - break - fork: - - select as /discovery + - select as discovery - break - fork: - - select as /ds + - select as ds - break - break - when request: @@ -65,14 +53,13 @@ stylesheet: tidy.xsl - pubinfo: publisher: https://md.fidus.skolverket.se/ - - when request mdq: - - first + - first - finalize: baseURL: https://md.fidus.skolverket.se/ cacheDuration: PT5H validUntil: P10D - sign: - key: http://hsm_client_hsmproxy.docker:8000/fidus/fidus + key: http://pyff_luna_1:8000/fidus/fidus cert: /etc/credentials/fidus.crt - emit application/xml - break diff --git a/metadata/fidus-test.fd b/metadata/fidus-test.fd index 283eadb..5617b60 100644 --- a/metadata/fidus-test.fd +++ b/metadata/fidus-test.fd @@ -11,8 +11,8 @@ - break - when update: - load: - - /opt/metadata/skolfederation-trial cleanup clean via local - - /opt/metadata/swamid cleanup clean via local + - /opt/metadata/skolfederation-trial cleanup clean + - /opt/metadata/swamid cleanup clean - /opt/metadata/test-idp cleanup clean via local - /opt/metadata/test-sp cleanup clean via local - select @@ -51,7 +51,7 @@ cacheDuration: PT5H validUntil: P10D - sign: - key: /etc/credentials/metadata.key + key: /etc/credentials/pyff-signing-key.pem cert: /etc/credentials/metadata.crt - emit application/xml - break |