diff options
| author | Leif Johansson <leifj@sunet.se> | 2012-01-25 10:07:44 +0100 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2012-01-25 10:07:44 +0100 |
| commit | 97dad6ff95170866529385f29207b9b7a428ada1 (patch) | |
| tree | e204fb630dc2975cccc8c4fae6d8d2e37519c4eb | |
| parent | e9772890e0137dda947ed0422e11363757eeedf9 (diff) | |
| parent | 7eec3d703a19bb65c1940c048e786f55da187fbd (diff) | |
Merge branch 'master' of md-master.swamid.se:swamid-metadata
| -rw-r--r-- | swamid-1.0.mxml | 1 | ||||
| -rw-r--r-- | swamid-1.0/betafoo.nordu.net-8000-saml2.xml | 4 | ||||
| -rw-r--r-- | swamid-testing-sp-1.0.mxml | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/swamid-1.0.mxml b/swamid-1.0.mxml index d3cd526a..0e12ada0 100644 --- a/swamid-1.0.mxml +++ b/swamid-1.0.mxml @@ -183,4 +183,5 @@ <xi:include href="swamid-1.0/account.liu.se.xml"/> <xi:include href="swamid-1.0/shibboleth.slu.se.xml"/> <xi:include href="swamid-1.0/betafoo.nordu.net-8000-saml2.xml"/> + <xi:include href="swamid-1.0/nagios-vm.nordu.net.xml"/> </EntitiesDescriptor> diff --git a/swamid-1.0/betafoo.nordu.net-8000-saml2.xml b/swamid-1.0/betafoo.nordu.net-8000-saml2.xml index 4e6e220a..d3b29f98 100644 --- a/swamid-1.0/betafoo.nordu.net-8000-saml2.xml +++ b/swamid-1.0/betafoo.nordu.net-8000-saml2.xml @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='UTF-8'?> -<md:EntityDescriptor entityID="http://betafoo.nordu.net:8000/saml2/metadata/" validUntil="2012-01-24T14:47:51Z" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"><md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"><md:KeyDescriptor><ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><ds:X509Data><ds:X509Certificate>MIIC3DCCAcSgAwIBAgIJAMvFLpEMEvybMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV +<md:EntityDescriptor entityID="https://betafoo.nordu.net/saml2/metadata/" validUntil="2012-01-25T11:51:19Z" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"><md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"><md:KeyDescriptor><ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><ds:X509Data><ds:X509Certificate>MIIC3DCCAcSgAwIBAgIJAMvFLpEMEvybMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV BAMTB2JldGFmb28wHhcNMTIwMTIzMTMwNzAwWhcNMjIwMTIwMTMwNzAwWjASMRAw DgYDVQQDEwdiZXRhZm9vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA n96BBnx0AbGpOlFnSJB2OM5eq/7nzzUx/lwfXIUxolYmz3m7QD16V6+wSRaVvK9R @@ -15,4 +15,4 @@ rdb+7oWy5pHdpXWEY3gD+Vod7aHJ2g8fQ70l+nqHmh5pFTzqb3dnh8Dbn9M8cG0F FqI3Il3tF2U+FgOT+nizupQelaoagRNerw3p2FHEYeBaTCYiW3IF7lUMIjoX2MYI 9P5iyOC2nGSq2vAzarevECtjw7KtKuX4K37LIEB5r07NXCPlfgTzHq1KomrY5Lhm 91krk/l5w5Ayt90FuWQbAA== -</ds:X509Certificate></ds:X509Data></ds:KeyInfo></md:KeyDescriptor><md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://betafoo.nordu.net:8000/saml2/ls/" /><md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://betafoo.nordu.net:8000/saml2/acs/" index="1" /><md:AttributeConsumingService index="1"><md:ServiceName xml:lang="en">Federated Django sample SP</md:ServiceName><md:RequestedAttribute FriendlyName="uid" Name="0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" /><md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false" /></md:AttributeConsumingService></md:SPSSODescriptor><md:ContactPerson contactType="technical"><md:Company>NORDUnet A/S</md:Company><md:GivenName>Johan</md:GivenName><md:SurName>Lundberg</md:SurName><md:EmailAddress>lundberg@nordu.net</md:EmailAddress></md:ContactPerson></md:EntityDescriptor>
\ No newline at end of file +</ds:X509Certificate></ds:X509Data></ds:KeyInfo></md:KeyDescriptor><md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://betafoo.nordu.net/saml2/ls/" /><md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://betafoo.nordu.net/saml2/acs/" index="1" /><md:AttributeConsumingService index="1"><md:ServiceName xml:lang="en">Federated Django sample SP</md:ServiceName><md:RequestedAttribute FriendlyName="uid" Name="0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" /><md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false" /></md:AttributeConsumingService></md:SPSSODescriptor><md:ContactPerson contactType="technical"><md:Company>NORDUnet A/S</md:Company><md:GivenName>Johan</md:GivenName><md:SurName>Lundberg</md:SurName><md:EmailAddress>lundberg@nordu.net</md:EmailAddress></md:ContactPerson></md:EntityDescriptor>
\ No newline at end of file diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml index e1b49254..7bc121fd 100644 --- a/swamid-testing-sp-1.0.mxml +++ b/swamid-testing-sp-1.0.mxml @@ -189,5 +189,4 @@ <xi:include href="swamid-1.0/www.testc.ladok.umu.se-aws-sp.xml"/> <xi:include href="swamid-1.0/www.testd.ladok.umu.se-aws-sp.xml"/> <xi:include href="swamid-1.0/www.testa.universityadmissions.se.xml"/> - <xi:include href="swamid-1.0/nagios-vm.nordu.net.xml"/> </EntitiesDescriptor> |