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

1 files changed, 23 insertions, 25 deletions

diff --git a/swamid-2.0/www.verifiering2.ladok.se-gui-sp.xml b/swamid-2.0/www.verifiering2.ladok.se-gui-sp.xml
index f966d417..bd0b071d 100644
--- a/swamid-2.0/www.verifiering2.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.verifiering2.ladok.se-gui-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://www.verifiering2.ladok.se/gui-sp">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -35,10 +31,12 @@ and do *NOT* provide it in real time to your partners.
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">Ladok www.verifiering2.ladok.se</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Ladok www.verifiering2.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
         <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://www.verifiering2.ladok.se/branded/HSK/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://www.verifiering2.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://www.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>
@@ -47,25 +45,7 @@ and do *NOT* provide it in real time to your partners.
         <ds:KeyName>www.verifiering2.ladok.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=www.verifiering2.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJAOPF0T70kbxjMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-BAMTGXd3dy52ZXJpZmllcmluZzIubGFkb2suc2UwHhcNMTYxMTAzMTMxMDI1WhcN
-MjYxMTAxMTMxMDI1WjAkMSIwIAYDVQQDExl3d3cudmVyaWZpZXJpbmcyLmxhZG9r
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsEVoQfr9KHltT4wE
-ig9Zs+vsrU0AQh+Aox6hutgLp/iFKz6JzPVleN10NRchyc3VrEmwL43Wp1Jh6DW3
-XyofyGa3aT2/LkgUcR9ClTY82dUZa5NK7WjVPexUZPoLVKHGJsuvD6YFd07ibPda
-7iIy8hN+Ne6ZSp4HJUEsJkFcawosgnsF4rJ/SzGHQLV+q6oQHCn3mMPXR6HJPey3
-kYUUgvlENicoOntxtKbcaZ5BLGiDwgNVsNjesOz5JzEydKS2urdO7GsvRc2jvfwI
-TvcwDhsWoiGLqSHGKQ+0CrJ6tw51dPdfdPUeEfGrRzZIT0/QOW5tuHyi1XUROzZf
-jcoBFwIDAQABo3EwbzBOBgNVHREERzBFghl3d3cudmVyaWZpZXJpbmcyLmxhZG9r
-LnNlhihodHRwczovL3d3dy52ZXJpZmllcmluZzIubGFkb2suc2UvZ3VpLXNwMB0G
-A1UdDgQWBBR5jokJc1gAbxQD8NghRE5nQtMpDDANBgkqhkiG9w0BAQUFAAOCAQEA
-I9xeF5VnW/WuBfNf7f9LfLzT7fcxoAnaZZpBnplR6746UE46jbDQa7L0bBy5qANf
-eVv3G5WFZpuQzBza2KyOeNdlR9F5ldDPFgtEFEkpYcB45tXWM7hGGyzRbg10GXNN
-9HMlLRcXdbV8BmvUxkFcJUas3tsmWj/W3PfCmNRDmBOBrgVY/YuDzcGm1oshldFw
-KAKgjjZMMe5vDAu9AGZWURVpVGocAVtkOjLQ0nZZ9qi6SRZdHd4O5h22vujfRi/0
-rm6/S+2nCwGRywXqEjAGc+A3O5raNvYp/r5egQB9lYFRG4YMI+3HoCTEiWYf9e/s
-+/nqZdArXL6iSqh/gH6MWw==
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJAOPF0T70kbxjMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNVBAMTGXd3dy52ZXJpZmllcmluZzIubGFkb2suc2UwHhcNMTYxMTAzMTMxMDI1WhcNMjYxMTAxMTMxMDI1WjAkMSIwIAYDVQQDExl3d3cudmVyaWZpZXJpbmcyLmxhZG9rLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsEVoQfr9KHltT4wEig9Zs+vsrU0AQh+Aox6hutgLp/iFKz6JzPVleN10NRchyc3VrEmwL43Wp1Jh6DW3XyofyGa3aT2/LkgUcR9ClTY82dUZa5NK7WjVPexUZPoLVKHGJsuvD6YFd07ibPda7iIy8hN+Ne6ZSp4HJUEsJkFcawosgnsF4rJ/SzGHQLV+q6oQHCn3mMPXR6HJPey3kYUUgvlENicoOntxtKbcaZ5BLGiDwgNVsNjesOz5JzEydKS2urdO7GsvRc2jvfwITvcwDhsWoiGLqSHGKQ+0CrJ6tw51dPdfdPUeEfGrRzZIT0/QOW5tuHyi1XUROzZfjcoBFwIDAQABo3EwbzBOBgNVHREERzBFghl3d3cudmVyaWZpZXJpbmcyLmxhZG9rLnNlhihodHRwczovL3d3dy52ZXJpZmllcmluZzIubGFkb2suc2UvZ3VpLXNwMB0GA1UdDgQWBBR5jokJc1gAbxQD8NghRE5nQtMpDDANBgkqhkiG9w0BAQUFAAOCAQEAI9xeF5VnW/WuBfNf7f9LfLzT7fcxoAnaZZpBnplR6746UE46jbDQa7L0bBy5qANfeVv3G5WFZpuQzBza2KyOeNdlR9F5ldDPFgtEFEkpYcB45tXWM7hGGyzRbg10GXNN9HMlLRcXdbV8BmvUxkFcJUas3tsmWj/W3PfCmNRDmBOBrgVY/YuDzcGm1oshldFwKAKgjjZMMe5vDAu9AGZWURVpVGocAVtkOjLQ0nZZ9qi6SRZdHd4O5h22vujfRi/0rm6/S+2nCwGRywXqEjAGc+A3O5raNvYp/r5egQB9lYFRG4YMI+3HoCTEiWYf9e/s+/nqZdArXL6iSqh/gH6MWw==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -93,4 +73,22 @@ rm6/S+2nCwGRywXqEjAGc+A3O5raNvYp/r5egQB9lYFRG4YMI+3HoCTEiWYf9e/s
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.verifiering2.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.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>