obsolete Ladok3 sites removed, Ladok3 sites updated with contactperson and mdui

1 files changed, 25 insertions, 27 deletions

diff --git a/swamid-2.0/student.verifiering2.ladok.se-student-sp.xml b/swamid-2.0/student.verifiering2.ladok.se-student-sp.xml
index 039f45e2..93f26c04 100644
--- a/swamid-2.0/student.verifiering2.ladok.se-student-sp.xml
+++ b/swamid-2.0/student.verifiering2.ladok.se-student-sp.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://student.verifiering2.ladok.se/student-sp">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -34,12 +30,14 @@ and do *NOT* provide it in real time to your partners.
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://student.verifiering2.ladok.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://student.verifiering2.ladok.se/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok student.verifiering2.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok student.verifiering2.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="sv">Ladok studentgränssnitt student.verifiering2.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok student web student.verifiering2.ladok.se</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
         <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://student.verifiering2.ladok.se/branded/HSK/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://student.verifiering2.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://student.verifiering2.ladok.se/logo/ladok_en.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">http://www.ladok.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.ladok.se/</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -48,25 +46,7 @@ and do *NOT* provide it in real time to your partners.
         <ds:KeyName>student.verifiering2.ladok.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=student.verifiering2.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJANhZ+lRwig0ZMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
-BAMTHXN0dWRlbnQudmVyaWZpZXJpbmcyLmxhZG9rLnNlMB4XDTE2MTEwMzEzMTAz
-NFoXDTI2MTEwMTEzMTAzNFowKDEmMCQGA1UEAxMdc3R1ZGVudC52ZXJpZmllcmlu
-ZzIubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCeQP5y
-KFSNh3FnbQIXyMkPb9iKemr7WUb91H1fmxXiwLFwrDwq0/ys+SD32Cz7D/ZM1yO9
-mR6Vl2hUic3CJnB3f4HxYk/MXKU21bRRXVOsVNDPcVmWHg6jVbDCRG2v5Ao1o+xN
-qQZP3GktTMjU6/vS1WsR/jfj5zUa73eLlsDV1iNNg6y7loEbdYq59VDIe8DaRElQ
-T0kGTQkDT/MVYsq1y2QBoDbLQs+fmYLByq9/aUzRAnvgsF3G7DNpHQpbwsLVmMjZ
-08nAsayHw6cUvNPxVCJZHjqOCxbpGHnXb2MXG3nKPzT3ghI7sj0rHcUXtpRH3Sx4
-KRjAx1jFrW4ahD5LAgMBAAGjfTB7MFoGA1UdEQRTMFGCHXN0dWRlbnQudmVyaWZp
-ZXJpbmcyLmxhZG9rLnNlhjBodHRwczovL3N0dWRlbnQudmVyaWZpZXJpbmcyLmxh
-ZG9rLnNlL3N0dWRlbnQtc3AwHQYDVR0OBBYEFPARxvZzMJsGmujx/cLGmNdFl7Hg
-MA0GCSqGSIb3DQEBBQUAA4IBAQCYWvLd5/8NPhLRFFPnOWAsBNeKjoaqMSI4QoM3
-HvEn7uPfR0UFJdx48+AKGSpGGFgZnd4AEGSNqEHivlmBfMBXpyKw1nQv5n/4jgMQ
-G3HV2lA1p9Ci9LoSMPyEQO+vhEcJrP5FtlSPilwV/fle3FcWr2wGc9c7yDpUKghm
-ByiBCBY3OjytRPllU4o4xJrE9M5IMYtdRWSpRxtohbnugBYV8iIg+UiesLPsrYGD
-6bW1zq3ALcJEW5NWiN/GANdzO/gXpHqDKSXJGTJ8w3yqBsGaAC/PH7fgNNdx5X7E
-qRNJvl1XCHSDHrGmnIDQdxeZhKEfTjzqLYUTT/OfhDB3gwDN
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJANhZ+lRwig0ZMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXN0dWRlbnQudmVyaWZpZXJpbmcyLmxhZG9rLnNlMB4XDTE2MTEwMzEzMTAzNFoXDTI2MTEwMTEzMTAzNFowKDEmMCQGA1UEAxMdc3R1ZGVudC52ZXJpZmllcmluZzIubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCeQP5yKFSNh3FnbQIXyMkPb9iKemr7WUb91H1fmxXiwLFwrDwq0/ys+SD32Cz7D/ZM1yO9mR6Vl2hUic3CJnB3f4HxYk/MXKU21bRRXVOsVNDPcVmWHg6jVbDCRG2v5Ao1o+xNqQZP3GktTMjU6/vS1WsR/jfj5zUa73eLlsDV1iNNg6y7loEbdYq59VDIe8DaRElQT0kGTQkDT/MVYsq1y2QBoDbLQs+fmYLByq9/aUzRAnvgsF3G7DNpHQpbwsLVmMjZ08nAsayHw6cUvNPxVCJZHjqOCxbpGHnXb2MXG3nKPzT3ghI7sj0rHcUXtpRH3Sx4KRjAx1jFrW4ahD5LAgMBAAGjfTB7MFoGA1UdEQRTMFGCHXN0dWRlbnQudmVyaWZpZXJpbmcyLmxhZG9rLnNlhjBodHRwczovL3N0dWRlbnQudmVyaWZpZXJpbmcyLmxhZG9rLnNlL3N0dWRlbnQtc3AwHQYDVR0OBBYEFPARxvZzMJsGmujx/cLGmNdFl7HgMA0GCSqGSIb3DQEBBQUAA4IBAQCYWvLd5/8NPhLRFFPnOWAsBNeKjoaqMSI4QoM3HvEn7uPfR0UFJdx48+AKGSpGGFgZnd4AEGSNqEHivlmBfMBXpyKw1nQv5n/4jgMQG3HV2lA1p9Ci9LoSMPyEQO+vhEcJrP5FtlSPilwV/fle3FcWr2wGc9c7yDpUKghmByiBCBY3OjytRPllU4o4xJrE9M5IMYtdRWSpRxtohbnugBYV8iIg+UiesLPsrYGD6bW1zq3ALcJEW5NWiN/GANdzO/gXpHqDKSXJGTJ8w3yqBsGaAC/PH7fgNNdx5X7EqRNJvl1XCHSDHrGmnIDQdxeZhKEfTjzqLYUTT/OfhDB3gwDN</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -94,4 +74,22 @@ qRNJvl1XCHSDHrGmnIDQdxeZhKEfTjzqLYUTT/OfhDB3gwDN
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.verifiering2.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.verifiering2.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Ladok-supporten</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>