ladok3-36 renamed to ladok3-01

3 files changed, 90 insertions, 86 deletions

diff --git a/swamid-2.0/ladok3-36.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml
index ac7865cd..ed7562aa 100644
--- a/swamid-2.0/ladok3-36.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml
@@ -3,7 +3,7 @@
 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" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://ladok3-36.ladok.umu.se/gui-sp">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://ladok3-01.ladok.umu.se/gui-sp">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
@@ -36,43 +36,45 @@ and do *NOT* provide it in real time to your partners.
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <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://ladok3-36.ladok.umu.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://ladok3-36.ladok.umu.se/Shibboleth.sso/Login" index="1"/>
+      <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://ladok3-01.ladok.umu.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://ladok3-01.ladok.umu.se/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Ladok test site ladok3-36</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok test site ladok3-36</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Ladok test site ladok3-01</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok test site ladok3-01</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 xml:lang="sv" width="96" height="98">https://ladok3-36.ladok.umu.se/logo/ladok_sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" width="96" height="98">https://ladok3-36.ladok.umu.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://ladok3-01.ladok.umu.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://ladok3-01.ladok.umu.se/logo/ladok_sv.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>
       <ds:KeyInfo>
-        <ds:KeyName>https://ladok3-36.ladok.umu.se/gui-sp</ds:KeyName>
-        <ds:KeyName>ladok3-36.ladok.umu.se</ds:KeyName>
+        <ds:KeyName>https://ladok3-01.ladok.umu.se/gui-sp</ds:KeyName>
+        <ds:KeyName>ladok3-01.ladok.umu.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-36.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIJANA75sFucBQoMA0GCSqGSIb3DQEBCwUAMCExHzAdBgNV
-BAMTFmxhZG9rMy0zNi5sYWRvay51bXUuc2UwHhcNMTcwMzAyMTQyNzU0WhcNMjcw
-MjI4MTQyNzU0WjAhMR8wHQYDVQQDExZsYWRvazMtMzYubGFkb2sudW11LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw06wyZTVOjXo3XV8drYk73bz
-nHMSDOkuUvw1eA9S6cjMfcLt3784UA9UBmtyH3f230yVF6N9VUGtvDEXiYSIASCb
-HBSqBbd6cPlLI+s9T66LZnWH4+hWBnKrkYh1DpCtZ4FQd+fZIq2jKl9BPWMO38iS
-zALAhdSilOo3SLVZLiF46W8FwowZf28CKvpr+9OA92yov9GiLHeqPQL8uFfZ5hsf
-uB9Jk2dov2eTxHSiSGN1LsndaJVmIip1Ui/NjqqOWbxe9kIeXzX8Kot/q4X/nmjs
-d8EdKhu4svmjS7Q4Iwq3oKV423kA8jKwy9AR+yLcA5I+D7gmmmg7qNDdqD9mBwID
-AQABo2swaTBIBgNVHREEQTA/ghZsYWRvazMtMzYubGFkb2sudW11LnNlhiVodHRw
-czovL2xhZG9rMy0zNi5sYWRvay51bXUuc2UvZ3VpLXNwMB0GA1UdDgQWBBSFZ0H0
-96xXzXLuk4sB4PI/ZRvY4jANBgkqhkiG9w0BAQsFAAOCAQEAv37jvD6Cd7UoiEGj
-pOKSojnotoSay5I7fhwSX12wxGmFmaFdffXEPJ0CAZKq/5BK8+5rWSZy3vfdxfER
-WsjO72kZ1/uqMoH3Y9uFWdD7UdiVETqt3W8Gy4ttRy/lRvKrR/yTzN0AWhuPoDMR
-0p7TAVUURzkeT6fUS4YSm5byYVLaBHOcXzw+dV8e9Tvxs6cQxeuFzsv73QHP8cju
-1VVbHJfa9t+YoLbSDoIYdKy5tigrMES+jZj/SXaL97iLDI2Id0oakDLR4T4OC+vr
-FRj/+46KgK5AsL+n3sTjKALRGR65Z0/foxp+qyEOEloBEJ0R2V1Sznei+ZN423j5
-+hBxvA==
+          <ds:X509SubjectName>CN=ladok3-01.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>-----BEGIN CERTIFICATE-----
+MIIDMDCCAhigAwIBAgIJAIp2R64De+1HMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+BAMTFmxhZG9rMy0wMS5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTE0NzE4WhcNMjIw
+NjI3MTE0NzE4WjAhMR8wHQYDVQQDExZsYWRvazMtMDEubGFkb2sudW11LnNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuwt+lqNvFGei/9H+xjcCTR6r
+gI5yUPlyK2ysVPvEk74oeWxFaCcHuvaiNUGjMwTyPiHSGijnyX9rHPfDTjphasn0
+M+OXn0j4RIBv6+tfLWr0NVM4CDK11/Dl34OivYe0bIx0hLhT+bXGddtb7AhNrzyi
+yN7eMtH8xVE4W0aZerCO0u7RR8fH/M8NE/Ge13cnoBgZH/oTVnQw4ZxwHmjGP9Ex
+tigoTyTwfYYGLt/Yx2Vg2dxJJPQ2oIiiaWN0/XxDy/hd3A5M9m5ZuJIzeflmVJLh
+4b9XsBzlbsK8KKiEKxDOUl9Gd8Lngl77kpFeephnngOMZoGQelFXPPalEndiUQID
+AQABo2swaTBIBgNVHREEQTA/ghZsYWRvazMtMDEubGFkb2sudW11LnNlhiVodHRw
+czovL2xhZG9rMy0wMS5sYWRvay51bXUuc2UvZ3VpLXNwMB0GA1UdDgQWBBTOzWRf
+EnLCvB5g3eADi4xLMzCoszANBgkqhkiG9w0BAQUFAAOCAQEAST3NMUyn+LDBfrts
+dfWxEJqOwHRplwn8eLNJHIdHkGjuLoR4cd1p40TLoMZrA/p6zU65oNrH9RYGiAOx
+Aac35aJFgxDJm1R/x1mt6cAa7OmuJ0Zt2m4TCUsapPbpkKlZFwwH3JLqAyUXo/8d
+xcMCpGhUSP5Cs4L/HeJhFwQpf1UnQB1s8z4dfctQtzTkj5z3uZeHYir6U+slvK7w
+0zvLTz/CibUY0lmIhwyt5TvkJBqQ2ybSOwOtHL5ysMthtFoNGIXznFAITAMk8eOu
+/HIhJOQBcAW1bMonM41YOZsCP/FtAoskCFRWYck704VF6IKzZAxoq0PiN22YFjL7
+p012eg==
+-----END CERTIFICATE-----
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -86,20 +88,20 @@ FRj/+46KgK5AsL+n3sTjKALRGR65Z0/foxp+qyEOEloBEJ0R2V1Sznei+ZN423j5
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
     </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-36.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-36.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-36.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-36.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-36.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-36.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-36.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-36.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-36.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-36.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-36.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-36.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-36.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-36.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
diff --git a/swamid-2.0/ladok3-36.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml
index 8176c182..535fd508 100644
--- a/swamid-2.0/ladok3-36.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml
@@ -3,7 +3,7 @@
 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" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://ladok3-36.ladok.umu.se/student-sp">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://ladok3-01.ladok.umu.se/student-sp">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
@@ -37,43 +37,45 @@ and do *NOT* provide it in real time to your partners.
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <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://ladok3-36.ladok.umu.se:446/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://ladok3-36.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
+      <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://ladok3-01.ladok.umu.se:446/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://ladok3-01.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Ladok studentgränssnitt ladok3-36</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok student web ladok3-36</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Ladok studentgränssnitt ladok3-01</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok student web ladok3-01</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 xml:lang="sv" width="96" height="98">https://ladok3-36.ladok.umu.se:446/logo/ladok_sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" width="96" height="98">https://ladok3-36.ladok.umu.se:446/logo/ladok_en.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://ladok3-01.ladok.umu.se:446/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://ladok3-01.ladok.umu.se:446/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>
       <ds:KeyInfo>
-        <ds:KeyName>https://ladok3-36.ladok.umu.se/student-sp</ds:KeyName>
-        <ds:KeyName>ladok3-36.ladok.umu.se</ds:KeyName>
+        <ds:KeyName>https://ladok3-01.ladok.umu.se/student-sp</ds:KeyName>
+        <ds:KeyName>ladok3-01.ladok.umu.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-36.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJAPFBn3O+qSw0MA0GCSqGSIb3DQEBCwUAMCExHzAdBgNV
-BAMTFmxhZG9rMy0zNi5sYWRvay51bXUuc2UwHhcNMTcwMzAyMTQyNzU4WhcNMjcw
-MjI4MTQyNzU4WjAhMR8wHQYDVQQDExZsYWRvazMtMzYubGFkb2sudW11LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1+kXghE36BmtOkVJU9rQy83D
-nnTLvLjTc88X0y+QwQe6U7nSVP1g/6Sf3MtOgx7vccpSzU/Fmi4LM9Q00qPVHRDX
-NyP1jEIdGGvKhU2Pi6Rl/hJM8mUaZ2u+SC2ac5GZXdy7oqi6h6SC5g2LdDiWXUkY
-PCqsrH7xP+P9XP+pX/+cTqKaoNtSx8ZZbPQaZTkz7++hT9i+ACcoWoj65aOCk5lB
-nTyNKpX4DqKt/KsPGWNfDanRiA3+0vRR/qyT3SoITKli4L5LeOWKzTorCMCuM4Qa
-jyKUHPIzVJduOTED8Zp2p7kbNXBIgoTwwXRZgWIM+Fnx/VC8bxy16DUOjvS8LwID
-AQABo28wbTBMBgNVHREERTBDghZsYWRvazMtMzYubGFkb2sudW11LnNlhilodHRw
-czovL2xhZG9rMy0zNi5sYWRvay51bXUuc2Uvc3R1ZGVudC1zcDAdBgNVHQ4EFgQU
-hDYu2CBPEYiO9eSdM0ZDxMlSpbEwDQYJKoZIhvcNAQELBQADggEBAA5d66WaUT4R
-IPndJub67Q4qaHX2rBkE1PJpTzcFM6MTLVbHJnkE5Fm3OJ3whZm1MDO6QTWxhf/Z
-WzMU+fHgsJcyZE2M3SfNtspCUPgGKzozSUSlVfHtegiQ5KWcEf3gS4UJRERXTyTE
-0J9wIEc0FgrihiAHjo68kC/K4Ttj7lQHnSgVII7Cn/+wMZ14FZJZIELz4qvY8PT/
-bYvKdGygv8e/zQ3XY4+4csAJXWN6MQ8L276F7+icw0+SUG2CpcCzZSWvj3Umlpm7
-3dxoJu8nUs5sUtphvneHCiSvKtHPGnlYJ6NTnypNpjmUNwH3WQe/BGuOl9Tez93E
-csM+y2d3jgE=
+          <ds:X509SubjectName>CN=ladok3-01.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>-----BEGIN CERTIFICATE-----
+MIIDPTCCAiWgAwIBAgIJAPEBgpwK1hxNMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+BAMTFmxhZG9rMy0wMS5sYWRvay51bXUuc2UwHhcNMTQxMDA2MDc1MTMxWhcNMjQx
+MDAzMDc1MTMxWjAhMR8wHQYDVQQDExZsYWRvazMtMDEubGFkb2sudW11LnNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0FInxZg2fEgXhvHMGxn0wAah
+TMCX0XTYmg5rs/fhJ2T0RAxuRCUmvf2ETW/F7makbonO75IDHghExLEUGkxcGK4v
+0uqaPM7/9C799QICJ5cmyrE7tCXOJPO9GAe28Qv88WJm/6DSwngnUryB2r7HlE0f
+UVrMQopRYLqD33eXBFQ732X9nqt9i/R5OK6O/kOE9nmyaBoQdmjZNLYxnobbDNrH
+PrcCje8NFVIxXjOzX8vssEpo8f0DtpOj34F15BSvrr8t5F28UdaTx0Hb7c9B3hW8
+KxAJxs0QHPCI/mgMpBxZBq+9uBLzTxiXvjUjw31EuQI6SJAkyyLBlqHgIUo6EQID
+AQABo3gwdjBVBgNVHREETjBMghZsYWRvazMtMDEubGFkb2sudW11LnNlhjJodHRw
+czovL2xhZG9rMy0wMS5sYWRvay51bXUuc2Uvc3R1ZGVudC1mcm9udGVuZC1zcDAd
+BgNVHQ4EFgQUahPApJv5/xIpL/gbnN8MUfFhhUowDQYJKoZIhvcNAQEFBQADggEB
+AETmm90R56msmOBioztlxMk6TOQbPYVi4NOnqTOokD/X960brBKntkGpXSnNGd7K
+tmK5F2ThcZJZ7FuOev53zJv2lzroBv9t0D8S49I3g4JlEM9TgoS8/hi/bFuC3PCC
+ONwj91gF9J6rzYTum9XhUOChqEg5JJskYHNHs9vmVfhmkHLh3RbGweXm3Da7zrph
+b+mNrM4Y+K+m3IlSj4NBvEIGlu8rf3rl1Iad2HcIevkCgiiCD8V+rumLzXSUTpKe
+ZEqci1h+aWvVDHxYNmDsZbFWOYg+t+Wfcu9uZxHADXvamSFdFAQJqplrSgXsWKNG
+Fgjs4zg7hkT8XjhWJeHVZjI=
+-----END CERTIFICATE-----
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -87,19 +89,19 @@ csM+y2d3jgE=
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
     </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-36.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-36.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-36.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-36.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-36.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-36.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-36.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-36.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-36.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-36.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-36.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-36.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-36.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-36.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-01.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-01.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-01.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-01.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-01.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-01.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-01.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-01.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-01.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-01.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-01.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-01.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-01.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-01.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
 </md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index fe1c3c09..ef7b7cdd 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -564,8 +564,8 @@
   <xi:include href="swamid-2.0/humio.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/halon-eu.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/test.fidus.sunet.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/ladok3-36.ladok.umu.se-gui-sp.xml"/>
-  <xi:include href="swamid-2.0/ladok3-36.ladok.umu.se-student-sp.xml"/>
+  <xi:include href="swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml"/>
+  <xi:include href="swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml"/>
   <xi:include href="swamid-2.0/exitpoll.stu.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/kb-se.zoom.us.xml"/>
   <xi:include href="swamid-2.0/dnsrpz-lookup.sunet.se-shibboleth.xml"/>