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

1 files changed, 20 insertions, 25 deletions

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>