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

9 files changed, 40 insertions, 304 deletions

diff --git a/swamid-2.0/daisy2.dsv.su.se-shibboleth.xml b/swamid-2.0/daisy2.dsv.su.se-shibboleth.xml
deleted file mode 100644
index a370b248..00000000
--- a/swamid-2.0/daisy2.dsv.su.se-shibboleth.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://daisy2.dsv.su.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2015-09-09T13:23:44Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-  </md:Extensions>
-  <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>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://daisy2.dsv.su.se/Shibboleth.sso/Login"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://daisy2.dsv.su.se/Shibboleth.sso/Login/SU"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://daisy2.dsv.su.se/Shibboleth.sso/DS/DSV"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://daisy2.dsv.su.se/Shibboleth.sso/DS/DSV" index="1"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://daisy2.dsv.su.se/Shibboleth.sso/DS/SU"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://daisy2.dsv.su.se/Shibboleth.sso/DS/SU" index="2"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://daisy2.dsv.su.se/Shibboleth.sso/DS/SWAMID"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://daisy2.dsv.su.se/Shibboleth.sso/DS/SWAMID" index="3"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Daisy testservern</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Daisy test server</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Studieadministrativt system för data- och systemvetenskap vid Stockholms universitet och ICT-skolan vid KTH.</mdui:Description>
-        <mdui:Description xml:lang="en">Administrative system for education used by the Department of Computer and Systems Sciences (DSV) at Stockholm University and the School of Information and Communication Technology (ICT) at KTH.</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>bart.dsv.su.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=bart.dsv.su.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC8TCCAdmgAwIBAgIJALjx35GfDy2+MA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-BAMTDmJhcnQuZHN2LnN1LnNlMB4XDTE0MDYwMzA5MDAwN1oXDTI0MDUzMTA5MDAw
-N1owGTEXMBUGA1UEAxMOYmFydC5kc3Yuc3Uuc2UwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDDH72IoX3FN1q8C/wi/nBGI7JPqYhqfCPRgIMyhbUc91mm
-E9TmCDpLlph5AUmrnWZePnCVDPdmMNeXk9q6AUAJ7Fb8+ncqlC7b9eK0htyVgKim
-hMcUYIYhAqVh0i0bEPJPlVz9C/ZWPKSCXalzbazlzB2T4Oe8dPIZUwqsqrxq2y/t
-yuo2g5S/c+lQaoQNcmpIqOhij1PkzfqDqJkjKrAPB8jZ4LevI0eaqD/ph7qScKoT
-Nld5qC1aOkl6m3IUPlSOYzmYuMAf05ZqWxl7WQSEMUCl3z0/GwaabJoixBG0Nzeo
-0z7Qa+xvovUDOLIbLPkaxuNlnLUA4ZVAfI4b8e0RAgMBAAGjPDA6MBkGA1UdEQQS
-MBCCDmJhcnQuZHN2LnN1LnNlMB0GA1UdDgQWBBS354c+HiRqrQIeJlT8Rd8W8GKx
-sjANBgkqhkiG9w0BAQUFAAOCAQEANBuBABm9/fJISdj+lPJzqG8XEwm9gQezZk/w
-GOKfFIZ2S/U/L1YbzRQlVE9P0ftArETqVTaIwBTK4NL6FYIuAhi2eoUit4V1dYOl
-UfNTFCu4UR07pmatB5T6ndcPJBPt2opBQLETpnP7f4TGLGc3r6zKDpdFHp2cs13R
-P7IQEHTAW2zgQXXuycIIeYwBEKeA0x5rJxu7nU6l+7X2Ee0UTX7pKK09pdkYZuj+
-cqQUpkIYPZGrZ0QgxPAAtyTiVDflXrL7i7CQ0ZJL2z4HP6a4qexoy7txCYPZtHf5
-z5YBnMaQJe+rBcMSFlxo5Iw8sVICkj3tKC9gROCAXNqi0/w1RA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://daisy2.dsv.su.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://daisy2.dsv.su.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://daisy2.dsv.su.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://daisy2.dsv.su.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://daisy2.dsv.su.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://daisy2.dsv.su.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://daisy2.dsv.su.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://daisy2.dsv.su.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://daisy2.dsv.su.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://daisy2.dsv.su.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://daisy2.dsv.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://daisy2.dsv.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://daisy2.dsv.su.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://daisy2.dsv.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>DSV, Stockholm University</md:Company>
-    <md:GivenName>DMC</md:GivenName>
-    <md:EmailAddress>mailto:dmc@dsv.su.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>DSV, Stockholm University</md:Company>
-    <md:GivenName>DMC</md:GivenName>
-    <md:EmailAddress>mailto:dmc@dsv.su.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>DSV, Stockholm University</md:Company>
-    <md:GivenName>DMC</md:GivenName>
-    <md:EmailAddress>mailto:dmc@dsv.su.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>DSV, Stockholm University</md:Company>
-    <md:GivenName>Security DMC</md:GivenName>
-    <md:EmailAddress>mailto:incident@dsv.su.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/digkonto-test.ita.chalmers.se.xml b/swamid-2.0/digkonto-test.ita.chalmers.se.xml
index 6cd6fc8a..d01195da 100644
--- a/swamid-2.0/digkonto-test.ita.chalmers.se.xml
+++ b/swamid-2.0/digkonto-test.ita.chalmers.se.xml
@@ -97,7 +97,7 @@ fwsIhlKJY1rN5SMDlQ==</ds:X509Certificate>
       <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/swamid-2.0/nagios.nordu.net-8087-sp.xml b/swamid-2.0/nagios.nordu.net-8087-sp.xml
deleted file mode 100644
index 469ee18c..00000000
--- a/swamid-2.0/nagios.nordu.net-8087-sp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://nagios.nordu.net:8087/sp.xml">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-02-20T18:03:30Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzb5Yaoeqw7s3ZDGi720X
-WrvKMXfnKt9z7TD7QzsbJFl6UdFDpIesx7UY/pgKE6JYlmOshNtaB5W9y/IP3Hm0
-05FYLYrP3UqHcGTiJ8ULRjH+Vg/eNXZk9aCUgk4f4DBbQGLo6QXWncwKW2CoCtwR
-L//g2DOX1RMVDqJrDQsUvXZjojS1wQ7W3SOLah0Ycc2MEzcRzxotr8dCtgAR/fuf
-sxhZOYN3amGvXw4JBdVC7yaw+HclZNjgQhy+9wzpn8+V+Rx2mJv5CPNVa9oDMi2S
-1MU0QotxufXqUNqZwiQqtYaalWS6my+8iRZs+RMLZFLtXTqEbDWR8+6NJdVXktYe
-xwIDAQAB
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzb5Yaoeqw7s3ZDGi720X
-WrvKMXfnKt9z7TD7QzsbJFl6UdFDpIesx7UY/pgKE6JYlmOshNtaB5W9y/IP3Hm0
-05FYLYrP3UqHcGTiJ8ULRjH+Vg/eNXZk9aCUgk4f4DBbQGLo6QXWncwKW2CoCtwR
-L//g2DOX1RMVDqJrDQsUvXZjojS1wQ7W3SOLah0Ycc2MEzcRzxotr8dCtgAR/fuf
-sxhZOYN3amGvXw4JBdVC7yaw+HclZNjgQhy+9wzpn8+V+Rx2mJv5CPNVa9oDMi2S
-1MU0QotxufXqUNqZwiQqtYaalWS6my+8iRZs+RMLZFLtXTqEbDWR8+6NJdVXktYe
-xwIDAQAB
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nagios.nordu.net:8087/acs/post" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nagios.nordu.net:8087/acs/redirect" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nagios.nordu.net:8087/acs/artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nagios.nordu.net:8087/ecp" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nagios.nordu.net:8087" index="5"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nagios.nordu.net-shibboleth.xml b/swamid-2.0/nagios.nordu.net-shibboleth.xml
deleted file mode 100644
index 15a8beac..00000000
--- a/swamid-2.0/nagios.nordu.net-shibboleth.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://nagios.nordu.net/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-06-12T08:15:13Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <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>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://nagios.nordu.net/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>nagios</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nagios</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC2TCCAcGgAwIBAgIJAOYa1BbBCe+lMA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
-BAMTBm5hZ2lvczAeFw0xMjAxMjUxMzMxMDlaFw0yMjAxMjIxMzMxMDlaMBExDzAN
-BgNVBAMTBm5hZ2lvczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANN1
-C+QdzDedN7C9wdTr61sJ9GgBbuWYCssGswZoa8loS3x7vnldyY2qcGRLamB0MUQ7
-T+xJMroALVl5dkM5H6sbfc5mXHoptLmWEpiP9PfctiWZxoeDMD9AitKUN4IBOdp8
-Sz/NC3tbzugrfsPjXsPHyi53W/zy3Obj0Kvd/0+NR9xekxRLDCyPs7RNWVW0Beg/
-bIvYCtSDAN9hyeh3B/3qqjbT+tOOgTCTECoAkGyffE79VAJqKGveU8aV+TJgCPCp
-Q4H3hXFzAqvNDjTEAYKK6R/ik5BDVmMmmzmBlfPuKazqIhYyrv8YF3uAkXWDMSrq
-TXjF8Z3/kZOvHEbdI6UCAwEAAaM0MDIwEQYDVR0RBAowCIIGbmFnaW9zMB0GA1Ud
-DgQWBBR/qpporP9Dp7ROA03roTFyo2ziXTANBgkqhkiG9w0BAQUFAAOCAQEAmuQf
-lX/pkGS+jJYNJ7Hq0tHxk/SmZ3/352tXiYsInawiRzO0IgUTVL1weHR7UQzwWgIM
-+awow3BYc97T5ql4o1L1r2/BQRvZJZCGj0dW54GekNx2kFxiDePvaTuUuTsSInCb
-Gj6YYhagaEqh7FgEWDb8BX4RozM2nuxN8s34XmdrY3xaM5HiH0QPExuk+a2yjuNQ
-m5ENIQmilN5KXbQtV5DLKO22/hfM+hjOXpO2LAyEK+uv9EgjIrHQhg2C+j1roEpF
-cmaSodg/QWPC0dJFDMtQhEx5sJTHL0ZYvfAlP9ldmsaUr4bg+vzq8ItixgX1+0D5
-J2FYmoN42tc/5eQBmQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>nagios</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nagios</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC2TCCAcGgAwIBAgIJAOYa1BbBCe+lMA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
-BAMTBm5hZ2lvczAeFw0xMjAxMjUxMzMxMDlaFw0yMjAxMjIxMzMxMDlaMBExDzAN
-BgNVBAMTBm5hZ2lvczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANN1
-C+QdzDedN7C9wdTr61sJ9GgBbuWYCssGswZoa8loS3x7vnldyY2qcGRLamB0MUQ7
-T+xJMroALVl5dkM5H6sbfc5mXHoptLmWEpiP9PfctiWZxoeDMD9AitKUN4IBOdp8
-Sz/NC3tbzugrfsPjXsPHyi53W/zy3Obj0Kvd/0+NR9xekxRLDCyPs7RNWVW0Beg/
-bIvYCtSDAN9hyeh3B/3qqjbT+tOOgTCTECoAkGyffE79VAJqKGveU8aV+TJgCPCp
-Q4H3hXFzAqvNDjTEAYKK6R/ik5BDVmMmmzmBlfPuKazqIhYyrv8YF3uAkXWDMSrq
-TXjF8Z3/kZOvHEbdI6UCAwEAAaM0MDIwEQYDVR0RBAowCIIGbmFnaW9zMB0GA1Ud
-DgQWBBR/qpporP9Dp7ROA03roTFyo2ziXTANBgkqhkiG9w0BAQUFAAOCAQEAmuQf
-lX/pkGS+jJYNJ7Hq0tHxk/SmZ3/352tXiYsInawiRzO0IgUTVL1weHR7UQzwWgIM
-+awow3BYc97T5ql4o1L1r2/BQRvZJZCGj0dW54GekNx2kFxiDePvaTuUuTsSInCb
-Gj6YYhagaEqh7FgEWDb8BX4RozM2nuxN8s34XmdrY3xaM5HiH0QPExuk+a2yjuNQ
-m5ENIQmilN5KXbQtV5DLKO22/hfM+hjOXpO2LAyEK+uv9EgjIrHQhg2C+j1roEpF
-cmaSodg/QWPC0dJFDMtQhEx5sJTHL0ZYvfAlP9ldmsaUr4bg+vzq8ItixgX1+0D5
-J2FYmoN42tc/5eQBmQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nagios.nordu.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nagios.nordu.net/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nagios.nordu.net/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nagios.nordu.net/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nagios.nordu.net/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nagios.nordu.net/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nagios.nordu.net/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nagios.nordu.net/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nagios.nordu.net/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nagios.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.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.nordu.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nagios.nordu.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nagios.nordu.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nagios.nordu.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nextcloud.fysik.su.se-apps-user_saml-saml-metadata.xml b/swamid-2.0/nextcloud.fysik.su.se-apps-user_saml-saml-metadata.xml
index ae65fd4e..8ba8bfc3 100644
--- a/swamid-2.0/nextcloud.fysik.su.se-apps-user_saml-saml-metadata.xml
+++ b/swamid-2.0/nextcloud.fysik.su.se-apps-user_saml-saml-metadata.xml
@@ -13,12 +13,14 @@
   <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Fysikum Nextcloud</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Fysikum Nextcloud</mdui:DisplayName>
         <mdui:Description xml:lang="en">Fysikum Nextcloud is a cloud storage, backup and collaborative online editing suite for Fysikum staff and collaborators.</mdui:Description>
         <mdui:InformationURL xml:lang="en">https://www.fysik.su.se/english/staff/it-and-telephony/nextcloud-storage-backup</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.su.se/om-webbplats-cookies/personuppgifter</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://www.su.se/english/about-this-website/privacy-policy</mdui:PrivacyStatementURL>
+        <mdui:Description xml:lang="sv">Fysikum Nextcloud är en molnlagring, backup och onlineredigeringssvit för Fysikums personal och medarbetare.</mdui:Description>
+        <mdui:DisplayName xml:lang="sv">Fysikum Nextcloud</mdui:DisplayName>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.su.se/om-webbplatsen</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="sv">https://www.su.se/fysikum/om-institutionen/internt/systemgruppens-hj%C3%A4lpsidor-1.566463</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
@@ -39,9 +41,10 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcloud.fysik.su.se/apps/user_saml/saml/acs" index="1"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">SU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Stockholm University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Stockholm University</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">Stockholm University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Stockholms Universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Fysikum, Stockholms Universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Fysikum, Stockholm University</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://www.fysik.su.se/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://www.fysik.su.se/english/</md:OrganizationURL>
   </md:Organization>
@@ -55,4 +58,15 @@
     <md:GivenName>IT Support at Fysikum</md:GivenName>
     <md:EmailAddress>mailto:dsa@fysik.su.se</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Alex</md:GivenName>
+    <md:SurName>Kastanas</md:SurName>
+    <md:EmailAddress>mailto:kastanas@fysik.su.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Holger</md:GivenName>
+    <md:SurName>Motzkau</md:SurName>
+    <md:EmailAddress>mailto:holger.motzkau@fysik.su.se</md:EmailAddress>
+    <md:TelephoneNumber>+46855378668</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ni.nordu.net-saml2-metadata-.xml b/swamid-2.0/ni.nordu.net-saml2-metadata-.xml
index f2b8bd2b..4590b7f9 100644
--- a/swamid-2.0/ni.nordu.net-saml2-metadata-.xml
+++ b/swamid-2.0/ni.nordu.net-saml2-metadata-.xml
@@ -17,6 +17,10 @@
         <mdui:Description xml:lang="en">Network Inventory</mdui:Description>
         <mdui:InformationURL xml:lang="en">https://portal.nordu.net/display/NI/Presentation</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://nordu.net/privacy-policy/</mdui:PrivacyStatementURL>
+        <mdui:DisplayName xml:lang="sv">Network Inventory NORDUnet</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="sv">https://portal.nordu.net/display/NI/Presentation</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Network Inventory</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://nordu.net/privacy-policy/</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -42,49 +46,40 @@ lHFHSZWekFvXeqCFNLjtWOiByw==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC6zCCAdOgAwIBAgIJAI32hx6m/IFWMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-BAMTDG5pLm5vcmR1Lm5ldDAeFw0xMjA4MzAxMjAyMTFaFw0yMjA4MjgxMjAyMTFa
-MBcxFTATBgNVBAMTDG5pLm5vcmR1Lm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAKIsfzWwYgW2y9+K58VQi35/weisNzGlYYJbpYY8+AqGhtkSpB8D
-z46HVvyZ1L6lgShGQ5fNUzB/zT9GuYnR1BbJMmz0t/XU1eLz1btyD11/DtL9FMm2
-c/FYPe9Srn9x0n6mtncZofWVeD+a8cdRoOOrLwjL25QGCfAPynSf0OdUraUM6qKt
-u4KGAK8FMDss8uLDaJjJVc1saeDg6NpvYralAY+CnyiuskLYhilmLb0tMu63+ma8
-XVtZV9bWPMyB1RnT9aRYXPL3GjiH/Pun1r74SsNP9M77RS7j3PD5Jf1wmPpIBZL0
-Dk6l3RnuVzK6D9zwTiAEDu3a+trzu5BzNMcCAwEAAaM6MDgwFwYDVR0RBBAwDoIM
-bmkubm9yZHUubmV0MB0GA1UdDgQWBBTPG/xsbxF7Q8OHyhUIktltkneGJTANBgkq
-hkiG9w0BAQUFAAOCAQEAI+gTmUEi7+iXxLJwhhnTm2w07fI8r/Rx3HXVQJ7fk0k9
-ZX+yVo16pG7uxzWu88w9urMpjlRMBV9xT7oE+7xuOppeSJbQpjxfYCArq/VD+Qr/
-WjzMRZMjN4LkL+s6m0f4ASItLF5MBXmStmxl5ZE0UajyR08i87sg9QcTVXBpyirr
-iRfdxDA4R+g0xwEZhpg2HbKRHeP8Uy/8SrOLYMFsblex5vc/96eZCOc88FlH1ydk
-zj16pWsjoYc1j+cnJBREpOJCeotrkBKte+OL1J5ku6e3qoQ+4Oyrsu4qhU/8geIo
-GtDqiUnI4ewwuxmNcK7kU1vUmBsiKlS5lyo8c+hpTA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ni.nordu.net/saml2/ls/"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ni.nordu.net/saml2/acs/" index="1"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">NOCLook</md:ServiceName>
+      <md:ServiceName xml:lang="sv">NOCLook</md:ServiceName>
       <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">NORDUnet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">NORDUnet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">NORDUnet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.nordu.net</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.nordu.net</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>NORDUnet A/S</md:Company>
-    <md:GivenName>Johan</md:GivenName>
-    <md:SurName>Lundberg</md:SurName>
-    <md:EmailAddress>mailto:lundberg@nordu.net</md:EmailAddress>
+    <md:GivenName>Markus</md:GivenName>
+    <md:SurName>Krogh</md:SurName>
+    <md:EmailAddress>mailto:markus@nordu.net</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="administrative">
     <md:Company>NORDUnet</md:Company>
     <md:EmailAddress>mailto:sei@nordu.net</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company>NORDUnet</md:Company>
+    <md:GivenName>NORDUnet CERT</md:GivenName>
+    <md:EmailAddress>mailto:cert@nordu.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>NORDUnet</md:Company>
+    <md:EmailAddress>mailto:sei@nordu.net</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 5b782b86..4728b328 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -84,7 +84,6 @@
   <xi:include href="swamid-2.0/cwd02.ub.uu.se-plugins-servlet-ssocookie.xml"/>
   <xi:include href="swamid-2.0/daisy.dsv.su.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/daisy.ict.kth.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/daisy2.dsv.su.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/data.houseoffinance.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/datalab.humlab.umu.se.xml"/>
   <xi:include href="swamid-2.0/dawn.bmc.lu.se-shibboleth.xml"/>
@@ -271,8 +270,6 @@
   <xi:include href="swamid-2.0/my.ilabsolutions.com.xml"/>
   <xi:include href="swamid-2.0/myaccount.chalmers.se.xml"/>
   <xi:include href="swamid-2.0/mystery.cs.lth.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/nagios.nordu.net-8087-sp.xml"/>
-  <xi:include href="swamid-2.0/nagios.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/nai.uu.se.xml"/>
   <xi:include href="swamid-2.0/nextcloud.fysik.su.se-apps-user_saml-saml-metadata.xml"/>
   <xi:include href="swamid-2.0/nfg.su.se-shibboleth.sso.xml"/>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 75095fcd..04b42a03 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -12,7 +12,6 @@
   <xi:include href="swamid-testing/hbidp-test.test.hb.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-testing/idp-shibtest.slu.se-idp.xml"/>
   <xi:include href="swamid-testing/idp-test.it.su.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-testing/idp-test.nordu.net-simplesaml-saml2-idp-metadata.php.xml"/>
   <xi:include href="swamid-testing/idp-test.suni.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-testing/idp.dev.eduid.se-idp.xml.xml"/>
   <xi:include href="swamid-testing/idp.test.antagning.se-aws-idp.xml"/>
diff --git a/swamid-testing/idp-test.nordu.net-simplesaml-saml2-idp-metadata.php.xml b/swamid-testing/idp-test.nordu.net-simplesaml-saml2-idp-metadata.php.xml
deleted file mode 100644
index 7260b357..00000000
--- a/swamid-testing/idp-test.nordu.net-simplesaml-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp-test.nordu.net/simplesaml/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-10-10T15:43:06Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp-test.nordu.net/simplesaml/saml2/idp/metadata.php">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID0DCCArigAwIBAgIJAIr7Fddfzg4nMA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlNFMRIwEAYDVQQHEwlTdG9ja2hvbG0xDjAMBgNVBAoTBU5VTk9DMRswGQYDVQQDExJpZHAtdGVzdC5ub3JkdS5uZXQwHhcNMTIxMDI5MTgwNzQ1WhcNMjIxMDI3MTgwNzQ1WjBOMQswCQYDVQQGEwJTRTESMBAGA1UEBxMJU3RvY2tob2xtMQ4wDAYDVQQKEwVOVU5PQzEbMBkGA1UEAxMSaWRwLXRlc3Qubm9yZHUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr3v3zhxKne0EmViKyxbsbe3qMjWQhWV2yVjrB5iGd9uoab16c25in8WxvRe0VvVCSsLgc0JU6JZHD30xEjNxrOu9kTeSyoG4uRX4T7fzJdWyadipV3QxsK9LCR+6ksw9mGu28mTDXtz7Wn/6H2vcEzgB0OOhqtfW4c+76oY83IrPARSrSZIeZbOJ2UJQYtqvK8H3hF3fNSoXRWk7+6FWkxS7lisQ3cT4cLeDnz2KkerTZzjz7pHBp0xCZ64fl74Q2BIVxPAczM2kU6n1sCC+Sd43jaPTdBbhEUAj9gwcdIM5O5UwO03C5qduu2ecJTa67Zd6PZkCqHiAeuoFBih1GwIDAQABo4GwMIGtMB0GA1UdDgQWBBTXJhD54J5C166ByFjM2AdH4A737zB+BgNVHSMEdzB1gBTXJhD54J5C166ByFjM2AdH4A7376FSpFAwTjELMAkGA1UEBhMCU0UxEjAQBgNVBAcTCVN0b2NraG9sbTEOMAwGA1UEChMFTlVOT0MxGzAZBgNVBAMTEmlkcC10ZXN0Lm5vcmR1Lm5ldIIJAIr7Fddfzg4nMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEj9YOaW9U4QT2h1Byw/IzH0NoWFCOY1ixSkCILg5Obll8tu4pqYgUb93bZnlClBx6S1Cc9v3cwVJWM9XayWGorpaVV8fXE8sWS0pEjcj5wW5bmQjHCbtn19sz6C7Ef7U4ZZrQ3iJvhaGlrBxO6oJ+Rxh0MB1ZdpohUm7blEockJ7O1vK54SDbaOQ/vsEMM+h0qqKitvaOjpUnGfKsn4k8H2yI95CoQjZe8QffqrHmpuUSpjSMq3AR5EJO3YPN0R19nSeksRjo5cLmWRpXQUA8wFcsW/4pFHhEhaq7ItX0WAKn7oAWghOq6sk+o3unRnIX8qJE/MOgThp4+8qwlM6a0=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID0DCCArigAwIBAgIJAIr7Fddfzg4nMA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlNFMRIwEAYDVQQHEwlTdG9ja2hvbG0xDjAMBgNVBAoTBU5VTk9DMRswGQYDVQQDExJpZHAtdGVzdC5ub3JkdS5uZXQwHhcNMTIxMDI5MTgwNzQ1WhcNMjIxMDI3MTgwNzQ1WjBOMQswCQYDVQQGEwJTRTESMBAGA1UEBxMJU3RvY2tob2xtMQ4wDAYDVQQKEwVOVU5PQzEbMBkGA1UEAxMSaWRwLXRlc3Qubm9yZHUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr3v3zhxKne0EmViKyxbsbe3qMjWQhWV2yVjrB5iGd9uoab16c25in8WxvRe0VvVCSsLgc0JU6JZHD30xEjNxrOu9kTeSyoG4uRX4T7fzJdWyadipV3QxsK9LCR+6ksw9mGu28mTDXtz7Wn/6H2vcEzgB0OOhqtfW4c+76oY83IrPARSrSZIeZbOJ2UJQYtqvK8H3hF3fNSoXRWk7+6FWkxS7lisQ3cT4cLeDnz2KkerTZzjz7pHBp0xCZ64fl74Q2BIVxPAczM2kU6n1sCC+Sd43jaPTdBbhEUAj9gwcdIM5O5UwO03C5qduu2ecJTa67Zd6PZkCqHiAeuoFBih1GwIDAQABo4GwMIGtMB0GA1UdDgQWBBTXJhD54J5C166ByFjM2AdH4A737zB+BgNVHSMEdzB1gBTXJhD54J5C166ByFjM2AdH4A7376FSpFAwTjELMAkGA1UEBhMCU0UxEjAQBgNVBAcTCVN0b2NraG9sbTEOMAwGA1UEChMFTlVOT0MxGzAZBgNVBAMTEmlkcC10ZXN0Lm5vcmR1Lm5ldIIJAIr7Fddfzg4nMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEj9YOaW9U4QT2h1Byw/IzH0NoWFCOY1ixSkCILg5Obll8tu4pqYgUb93bZnlClBx6S1Cc9v3cwVJWM9XayWGorpaVV8fXE8sWS0pEjcj5wW5bmQjHCbtn19sz6C7Ef7U4ZZrQ3iJvhaGlrBxO6oJ+Rxh0MB1ZdpohUm7blEockJ7O1vK54SDbaOQ/vsEMM+h0qqKitvaOjpUnGfKsn4k8H2yI95CoQjZe8QffqrHmpuUSpjSMq3AR5EJO3YPN0R19nSeksRjo5cLmWRpXQUA8wFcsW/4pFHhEhaq7ItX0WAKn7oAWghOq6sk+o3unRnIX8qJE/MOgThp4+8qwlM6a0=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.nordu.net/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.nordu.net/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SUNET</md:GivenName>
-    <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>