nya metadata

git-svn-id: svn+ssh://svn.it.su.se/svn/swamid-metadata/trunk@25 0878fbc5-a6f2-46f6-b174-cb7b08c221d1

3 files changed, 53 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index 768b6043..b28fff23 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,11 @@ all: update sign
 update:
 	@svn up -q
 
-sign: 
+sign: swamid nya
+
+swamid:
 	@saml-md-tool swamid-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
 	@test -s swamid-1.0.xml && mv swamid-1.0.xml /local/saml-metadata
+
+nya:
+	@saml-md-tool nya-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
diff --git a/nya-1.0.mxml b/nya-1.0.mxml
new file mode 100644
index 00000000..fdfd9b19
--- /dev/null
+++ b/nya-1.0.mxml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<md:EntitiesDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <xi:include href="swamid-1.0/idp.secure.su.se.xml"/>
+  <xi:include href="swamid-1.0/sp1.lab.it.su.se.xml"/>
+  <xi:include href="nya/wb-00.ladok.umu.se.xml"/>
+</md:EntitiesDescriptor>
diff --git a/nya-1.0/wb-00.ladok.umu.se.xml b/nya-1.0/wb-00.ladok.umu.se.xml
new file mode 100644
index 00000000..3af9b307
--- /dev/null
+++ b/nya-1.0/wb-00.ladok.umu.se.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wb-00.ladok.umu.se/shibboleth-idp">
+  <AttributeAuthorityDescriptor ID="role-11" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">su.se</shibmeta:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC/jCCAeagAwIBAgIJAMXBqFyzE+eyMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGMubGFkb2sudW11LnNlMB4XDTA4MDExMTExMTg0NloXDTE4MDEwODExMTg0NlowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0Yy5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDuOJy8znIq+12hFWckc2W4ghjWa8ltdyM850ty7pgetqFWg5lDO0GLRJSRne9eth0xowH4h9PcBa1Y+wKV71MiU5QHX+k3nyreN+HjxJ2vki0DD0fW5D3EdpXW/bHyQZ/R5v4dgGjevgsuGNJMB2ncJhVELIe/XJZotW86r973aYVnsadEy3XuYi6mvCm60OYk44H2IC2lx9wbmfA843ckSHTU75UvWKlfIAFFuMKZzP9XNIZVeHIvSxV3fNe1hrE82Otvz5t4avLbEXnsD/GWqnlYyaJ9IQksR240fLWs+3wB9IFRZ63BnFCwVDoBpNpPEPUTKrW+RIM8OSUzvmrAgMBAAGjKzApMCcGA1UdJQQgMB4GCCsGAQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQEFBQADggEBAFgTPFlDaGv1rMB1ZJw6ZuNYWfAkWBnknqgp7gVFqCyhAkCAi9TxNf23Bxp6l9sVRzBKYoh5lBS14qeaivJ7A/47aOBRElo0oH3TO/3vW+lWRs+B0rVXvSYniGphXpGH9oFDx92/uqww7hTb3AuBAVqqTDfgj0HQWXoH3FKX9nBhFLeqXn1E0Zo4y2tdZKjkVIu1BVELApbmG/cuo6bnjOo20vs63j8XtEhhRoV+jVdJS8WtI/rZhxsXqBe4gzEdeahaj1HkRbLsv/6HRS1b74wvklpdZg/QaC7rup4tTCkDqW5ioeHL3eYwP0iuGkQtyxHLyX9IOuT1Lt+/TKSzC+4=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wb-00.ladok.umu.se:8443/shibboleth-idp/AA"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <IDPSSODescriptor WantAuthnRequestsSigned="false" ID="role-12" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <Extensions>
+      <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">studera.nu</shibmeta:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC/jCCAeagAwIBAgIJAMXBqFyzE+eyMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGMubGFkb2sudW11LnNlMB4XDTA4MDExMTExMTg0NloXDTE4MDEwODExMTg0NlowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0Yy5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDuOJy8znIq+12hFWckc2W4ghjWa8ltdyM850ty7pgetqFWg5lDO0GLRJSRne9eth0xowH4h9PcBa1Y+wKV71MiU5QHX+k3nyreN+HjxJ2vki0DD0fW5D3EdpXW/bHyQZ/R5v4dgGjevgsuGNJMB2ncJhVELIe/XJZotW86r973aYVnsadEy3XuYi6mvCm60OYk44H2IC2lx9wbmfA843ckSHTU75UvWKlfIAFFuMKZzP9XNIZVeHIvSxV3fNe1hrE82Otvz5t4avLbEXnsD/GWqnlYyaJ9IQksR240fLWs+3wB9IFRZ63BnFCwVDoBpNpPEPUTKrW+RIM8OSUzvmrAgMBAAGjKzApMCcGA1UdJQQgMB4GCCsGAQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQEFBQADggEBAFgTPFlDaGv1rMB1ZJw6ZuNYWfAkWBnknqgp7gVFqCyhAkCAi9TxNf23Bxp6l9sVRzBKYoh5lBS14qeaivJ7A/47aOBRElo0oH3TO/3vW+lWRs+B0rVXvSYniGphXpGH9oFDx92/uqww7hTb3AuBAVqqTDfgj0HQWXoH3FKX9nBhFLeqXn1E0Zo4y2tdZKjkVIu1BVELApbmG/cuo6bnjOo20vs63j8XtEhhRoV+jVdJS8WtI/rZhxsXqBe4gzEdeahaj1HkRbLsv/6HRS1b74wvklpdZg/QaC7rup4tTCkDqW5ioeHL3eYwP0iuGkQtyxHLyX9IOuT1Lt+/TKSzC+4=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wb-00.ladok.umu.se:8443/shibboleth-idp/Artifact" index="1" isDefault="true"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://wb-00.ladok.umu.se:8443/shibboleth-idp/SSO"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">studera.nu</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">studera.nu</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.studera.nu</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <Company>Umeå university</Company>
+    <EmailAddress>fredrik.aslund@ladok.umu.se</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>