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

1 files changed, 25 insertions, 22 deletions

diff --git a/swamid-2.0/student.test.ladok.se-student-sp.xml b/swamid-2.0/student.test.ladok.se-student-sp.xml
index adeb6d85..f84c0cff 100644
--- a/swamid-2.0/student.test.ladok.se-student-sp.xml
+++ b/swamid-2.0/student.test.ladok.se-student-sp.xml
@@ -30,12 +30,14 @@
       <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.test.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.test.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.test.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok student.test.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="sv">Ladok studentgränssnitt student.test.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok student web student.test.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.test.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://student.test.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://student.test.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>
@@ -44,24 +46,7 @@
         <ds:KeyName>student.test.ladok.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=student.test.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIJAMfe9MUSIYwzMA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNV
-BAMTFXN0dWRlbnQudGVzdC5sYWRvay5zZTAeFw0xNjAzMTcxMDQ0MTRaFw0yNjAz
-MTUxMDQ0MTRaMCAxHjAcBgNVBAMTFXN0dWRlbnQudGVzdC5sYWRvay5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALoXQxzxa7rCjHFU3SiCf9W//E5x
-gZugxikwRTBus+1XiT9oNDSiztbFPTGsUv/PLaSeyPs6hqd2bpBh3yOOItb/PCQJ
-hGLVWFXZHSBifX4Aa+bh18ZbXtIPT8P+LhNMesdh6DVnDo5Ksd2cvbHxRO9WlNMb
-tzNM5iUJZiVfwmkwo3Y5xbWQ3NPCinmMQPWLVl0gKteoouu5SrCUm6s/TFNNIspQ
-IJRUlieSn0MUyYCidLpadbNEarcC5wX4Pn9viA4ZBimiUcOzbPyxUcdLdW3bHUEO
-E/F0b/+34N4oBUytLcFo4nTlUjWaKBSv7dwFAYt0UjATVp+LdMwZmBcgrvsCAwEA
-AaNpMGcwRgYDVR0RBD8wPYIVc3R1ZGVudC50ZXN0LmxhZG9rLnNlhiRodHRwczov
-L3N0dWRlbnQudGVzdC5sYWRvay5zZS9ndWktc3AwHQYDVR0OBBYEFEdfw76scgUA
-y16cvwoO7eZP/DQbMA0GCSqGSIb3DQEBCwUAA4IBAQAdEWyyTL9P5TTNX0NuJmGA
-HNR/yi/RUIZ8vbFzuuSsFmMnKN+iVyQqnS0cWsHXs/KWNdziHSHcQusKp0l8Zmmb
-6Dj2adzigSVW22GNdFsDSRUkKuI70SP0gWCjlQ6pezYCNzNlG85VnMRHWkP461l2
-YUmMJSKSreltDQGom/gj9JDiFxaGr7puePNSyYqVX4AFY81u+JB5+tTTgyNhZRxc
-fUO4UUy2FV9/ugZdSEQmuL2TcPi/Qjr7iYf421GeoBUvEWeANRekKCb5IRhvWmw/
-KKCbhHGTmGZP2tQ6zng2z2GDI1/icN6GfRAuzgthsOqC74sM4tn8VoLT0IdDOPj5
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIJAMfe9MUSIYwzMA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNVBAMTFXN0dWRlbnQudGVzdC5sYWRvay5zZTAeFw0xNjAzMTcxMDQ0MTRaFw0yNjAzMTUxMDQ0MTRaMCAxHjAcBgNVBAMTFXN0dWRlbnQudGVzdC5sYWRvay5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALoXQxzxa7rCjHFU3SiCf9W//E5xgZugxikwRTBus+1XiT9oNDSiztbFPTGsUv/PLaSeyPs6hqd2bpBh3yOOItb/PCQJhGLVWFXZHSBifX4Aa+bh18ZbXtIPT8P+LhNMesdh6DVnDo5Ksd2cvbHxRO9WlNMbtzNM5iUJZiVfwmkwo3Y5xbWQ3NPCinmMQPWLVl0gKteoouu5SrCUm6s/TFNNIspQIJRUlieSn0MUyYCidLpadbNEarcC5wX4Pn9viA4ZBimiUcOzbPyxUcdLdW3bHUEOE/F0b/+34N4oBUytLcFo4nTlUjWaKBSv7dwFAYt0UjATVp+LdMwZmBcgrvsCAwEAAaNpMGcwRgYDVR0RBD8wPYIVc3R1ZGVudC50ZXN0LmxhZG9rLnNlhiRodHRwczovL3N0dWRlbnQudGVzdC5sYWRvay5zZS9ndWktc3AwHQYDVR0OBBYEFEdfw76scgUAy16cvwoO7eZP/DQbMA0GCSqGSIb3DQEBCwUAA4IBAQAdEWyyTL9P5TTNX0NuJmGAHNR/yi/RUIZ8vbFzuuSsFmMnKN+iVyQqnS0cWsHXs/KWNdziHSHcQusKp0l8Zmmb6Dj2adzigSVW22GNdFsDSRUkKuI70SP0gWCjlQ6pezYCNzNlG85VnMRHWkP461l2YUmMJSKSreltDQGom/gj9JDiFxaGr7puePNSyYqVX4AFY81u+JB5+tTTgyNhZRxcfUO4UUy2FV9/ugZdSEQmuL2TcPi/Qjr7iYf421GeoBUvEWeANRekKCb5IRhvWmw/KKCbhHGTmGZP2tQ6zng2z2GDI1/icN6GfRAuzgthsOqC74sM4tn8VoLT0IdDOPj5</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -89,4 +74,22 @@ KKCbhHGTmGZP2tQ6zng2z2GDI1/icN6GfRAuzgthsOqC74sM4tn8VoLT0IdDOPj5
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.test.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.test.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>