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

1 files changed, 23 insertions, 24 deletions

diff --git a/swamid-2.0/www.utb1.ladok.se-gui-sp.xml b/swamid-2.0/www.utb1.ladok.se-gui-sp.xml
index dea1c364..3ba20172 100644
--- a/swamid-2.0/www.utb1.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.utb1.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.utb1.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.utb1.ladok.se</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Ladok www.utb1.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.utb1.ladok.se/branded/HSK/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://www.utb1.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://www.utb1.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,24 +45,7 @@ and do *NOT* provide it in real time to your partners.
         <ds:KeyName>www.utb1.ladok.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=www.utb1.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAM+qK4tCqL2EMA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNV
-BAMTEXd3dy51dGIxLmxhZG9rLnNlMB4XDTE3MDEyNjE0MzUyOFoXDTI3MDEyNDE0
-MzUyOFowHDEaMBgGA1UEAxMRd3d3LnV0YjEubGFkb2suc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC/CuONAwz2GCkH2TOEyLL/oiv4FsUE8Hj4ZMmr
-ycIDlJW+hKNvkm33cVNaLqdwjhHTHcAtO1ft09RIETmm4xwy6vb/j/UKbxaWnScE
-dG4hjWSfaK1e+cus+TNPJqMRzAhAvbzswMUD/MTT2aujspLO0R8Jcv4Pv/vUlsEg
-y1JF996Z6uRP+7r0riycM/0m+WfMjVb6S4gY5W59i/6CECPMIfngITYTcMiksm/B
-uAPkZfjEtdMF3e+wYJYBq7Rf74glDqYis9noIljxq9b8Q3BsovY8MjGxDLW1fLQG
-otANZzvJxvPoqCf2232eDw5fFZqVyQNR5p+vY4FiLX1KA65DAgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEXd3dy51dGIxLmxhZG9rLnNlhiBodHRwczovL3d3dy51dGIxLmxh
-ZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQUa8S1EY5StIBDDNc9Ke2RkgGksjMwDQYJ
-KoZIhvcNAQELBQADggEBAGb8B+qZ1KmD0dv7iKxyEPjqf5pAaJgbNSnvQ0aj2iyX
-ISK8PFtdv1d9JExWJL0xFxQkVDPCxmEzONU/fS7fcEbgwRCQSnz0AXQA35MHt6Ok
-jWppAAdaHhrUkqNT0Cd6CUViu6NprlYFbX/urDuar8fNhWgQO3tP7e4WwzV1D6Fp
-bSCJgeB5rqOTKqtehIrVheBwN5NQai0zUxWGCaS+TRP61mJypCt+FZLEN1QN74PM
-Fc7ieensUcthlhlVjbDVwVEKHT2kC6AG9REMwd5lX7hthwtp8dqoG2pFd4rZszib
-OUYwmw3l+n/vYKmVA5j2HBJ7e68QgZokawXALKegbvY=
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAM+qK4tCqL2EMA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNVBAMTEXd3dy51dGIxLmxhZG9rLnNlMB4XDTE3MDEyNjE0MzUyOFoXDTI3MDEyNDE0MzUyOFowHDEaMBgGA1UEAxMRd3d3LnV0YjEubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/CuONAwz2GCkH2TOEyLL/oiv4FsUE8Hj4ZMmrycIDlJW+hKNvkm33cVNaLqdwjhHTHcAtO1ft09RIETmm4xwy6vb/j/UKbxaWnScEdG4hjWSfaK1e+cus+TNPJqMRzAhAvbzswMUD/MTT2aujspLO0R8Jcv4Pv/vUlsEgy1JF996Z6uRP+7r0riycM/0m+WfMjVb6S4gY5W59i/6CECPMIfngITYTcMiksm/BuAPkZfjEtdMF3e+wYJYBq7Rf74glDqYis9noIljxq9b8Q3BsovY8MjGxDLW1fLQGotANZzvJxvPoqCf2232eDw5fFZqVyQNR5p+vY4FiLX1KA65DAgMBAAGjYTBfMD4GA1UdEQQ3MDWCEXd3dy51dGIxLmxhZG9rLnNlhiBodHRwczovL3d3dy51dGIxLmxhZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQUa8S1EY5StIBDDNc9Ke2RkgGksjMwDQYJKoZIhvcNAQELBQADggEBAGb8B+qZ1KmD0dv7iKxyEPjqf5pAaJgbNSnvQ0aj2iyXISK8PFtdv1d9JExWJL0xFxQkVDPCxmEzONU/fS7fcEbgwRCQSnz0AXQA35MHt6OkjWppAAdaHhrUkqNT0Cd6CUViu6NprlYFbX/urDuar8fNhWgQO3tP7e4WwzV1D6FpbSCJgeB5rqOTKqtehIrVheBwN5NQai0zUxWGCaS+TRP61mJypCt+FZLEN1QN74PMFc7ieensUcthlhlVjbDVwVEKHT2kC6AG9REMwd5lX7hthwtp8dqoG2pFd4rZszibOUYwmw3l+n/vYKmVA5j2HBJ7e68QgZokawXALKegbvY=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -92,4 +73,22 @@ OUYwmw3l+n/vYKmVA5j2HBJ7e68QgZokawXALKegbvY=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.utb1.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.utb1.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>