Merge branch 'master' of md-master.swamid.se:swamid-metadata

2 files changed, 78 insertions, 0 deletions

diff --git a/swamid-1.0/nagios-vm.nordu.net.xml b/swamid-1.0/nagios-vm.nordu.net.xml
new file mode 100644
index 00000000..d0c6032d
--- /dev/null
+++ b/swamid-1.0/nagios-vm.nordu.net.xml
@@ -0,0 +1,77 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_5edc222ac3c5d20af7bfb8adaff2623a" entityID="https://nagios-vm.nordu.net/shibboleth">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://nagios-vm.nordu.net/Shibboleth.sso/DS" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>nagios-vm.nordu.net</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nagios-vm.nordu.net</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDFTCCAf2gAwIBAgIJAOw/1rDNh+d1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE25hZ2lvcy12bS5ub3JkdS5uZXQwHhcNMTIwMTE4MTUxMTEzWhcNMjIwMTE1
+MTUxMTEzWjAeMRwwGgYDVQQDExNuYWdpb3Mtdm0ubm9yZHUubmV0MIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuvq7eAvCyajQnHvaHTSH1iQrejBHrBUr
+ZYkZktae1onE3oC74JwUbVQNBKu0FS0uLxdphAib923Ra3xpLmFV3cvGQrtYgxeG
+0MJOqyq8wMX5Q/2+VArKsk+BfL5XK/HdFDkZAZWSh2Se/+dgpAwo0GZuSqN64RA4
+b7uaodXO9PwLOKAVeaS522vr14mRXEG12w1D+R29+8kDW3UQHpD8/oDwXuvjS23N
+xiRxgOAI3c1khI8PuKH7mljFXG6H+KAikr9lhPo/ikFk4oh28pRtHFSzAnRem4a+
+aoSVLXXLHhjWd1mJbRPXHuQQBkNHZB1atBRvxR9gibfNpHfQTGtEMQIDAQABo1Yw
+VDAzBgNVHREELDAqghNuYWdpb3Mtdm0ubm9yZHUubmV0hhNuYWdpb3Mtdm0ubm9y
+ZHUubmV0MB0GA1UdDgQWBBSj4lzVVrzyTNgaGDhYFU4VG2YclDANBgkqhkiG9w0B
+AQUFAAOCAQEAZAlVWmvyps2vBdo86LsSj18c4ajuR14D2vAJmhLRSzjsvMjgg2dP
+pca2fCvqh1c96TiJ47lKq13cLgOSnNkL6yaNnCjSDr/qC67X9BOoZdXBQyJziWZr
+g+eF3GQzzrnvJB2/CQeT7IoyYtHeOMUgoodhiu4ABWIlkKJ5CymHGoOqDTkoibV0
+iw2iKpPj52u7wvsN0sSzQ1Gh4pf8D75dJZtAQevNRKz89wGVQUxFrgm5OEviuhIR
+5AMm/41ESEoDFvKk3RCK3JqTM6hV2s8ofGYJzGv1rK8qD78nJEsdbd0DRqgD4Iwi
+iTg/j/tOBYfIuWhX2ipi+fFwWaqmIk1LxA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>nagios-vm.nordu.net</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nagios-vm.nordu.net</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDFTCCAf2gAwIBAgIJAOw/1rDNh+d1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE25hZ2lvcy12bS5ub3JkdS5uZXQwHhcNMTIwMTE4MTUxMTEzWhcNMjIwMTE1
+MTUxMTEzWjAeMRwwGgYDVQQDExNuYWdpb3Mtdm0ubm9yZHUubmV0MIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuvq7eAvCyajQnHvaHTSH1iQrejBHrBUr
+ZYkZktae1onE3oC74JwUbVQNBKu0FS0uLxdphAib923Ra3xpLmFV3cvGQrtYgxeG
+0MJOqyq8wMX5Q/2+VArKsk+BfL5XK/HdFDkZAZWSh2Se/+dgpAwo0GZuSqN64RA4
+b7uaodXO9PwLOKAVeaS522vr14mRXEG12w1D+R29+8kDW3UQHpD8/oDwXuvjS23N
+xiRxgOAI3c1khI8PuKH7mljFXG6H+KAikr9lhPo/ikFk4oh28pRtHFSzAnRem4a+
+aoSVLXXLHhjWd1mJbRPXHuQQBkNHZB1atBRvxR9gibfNpHfQTGtEMQIDAQABo1Yw
+VDAzBgNVHREELDAqghNuYWdpb3Mtdm0ubm9yZHUubmV0hhNuYWdpb3Mtdm0ubm9y
+ZHUubmV0MB0GA1UdDgQWBBSj4lzVVrzyTNgaGDhYFU4VG2YclDANBgkqhkiG9w0B
+AQUFAAOCAQEAZAlVWmvyps2vBdo86LsSj18c4ajuR14D2vAJmhLRSzjsvMjgg2dP
+pca2fCvqh1c96TiJ47lKq13cLgOSnNkL6yaNnCjSDr/qC67X9BOoZdXBQyJziWZr
+g+eF3GQzzrnvJB2/CQeT7IoyYtHeOMUgoodhiu4ABWIlkKJ5CymHGoOqDTkoibV0
+iw2iKpPj52u7wvsN0sSzQ1Gh4pf8D75dJZtAQevNRKz89wGVQUxFrgm5OEviuhIR
+5AMm/41ESEoDFvKk3RCK3JqTM6hV2s8ofGYJzGv1rK8qD78nJEsdbd0DRqgD4Iwi
+iTg/j/tOBYfIuWhX2ipi+fFwWaqmIk1LxA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nagios-vm.nordu.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nagios-vm.nordu.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nagios-vm.nordu.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nagios-vm.nordu.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nagios-vm.nordu.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nagios-vm.nordu.net/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nagios-vm.nordu.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nagios-vm.nordu.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nagios-vm.nordu.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nagios-vm.nordu.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nagios-vm.nordu.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nagios-vm.nordu.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nagios-vm.nordu.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nagios-vm.nordu.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nagios-vm.nordu.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</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 7bc121fd..e1b49254 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -189,4 +189,5 @@
   <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>