Merge branch 'master' of git.swamid.se:swamid-metadata

15 files changed, 19 insertions, 45 deletions

diff --git a/swamid-2.0/admin.akademiskahogtider.se-shibboleth.sso.xml b/swamid-2.0/admin.akademiskahogtider.se-shibboleth.sso.xml
index 4bc97d9f..c124de09 100644
--- a/swamid-2.0/admin.akademiskahogtider.se-shibboleth.sso.xml
+++ b/swamid-2.0/admin.akademiskahogtider.se-shibboleth.sso.xml
@@ -18,7 +18,8 @@
         <mdui:DisplayName xml:lang="en">Database of Honorary Doctors</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Hedersdoktorsdatabasen är en förteckning av hedersdoktorer vid svenska lärosäten. Förteckningen är sökbar och öppen för alla, men framförallt är det ett hjälpmedel för alla fakulteter som är i färd med att utse nya hedersdoktorer.</mdui:Description>
         <mdui:Description xml:lang="en">The Database of Honorary Doctors is a register of honorary doctorates that has been issued by Swedish universities and university colleges. The register is open to the general public but is foremost a resource for faculties in the pursuit of appointing new honorary doctors.</mdui:Description>
-        <mdui:Logo height="190" width="190">https://admin.akademiskahogtider.se/favicon.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="190" width="190">https://admin.akademiskahogtider.se/favicon.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="190" width="190">https://admin.akademiskahogtider.se/favicon.png</mdui:Logo>
         <mdui:InformationURL xml:lang="sv">https://admin.akademiskahogtider.se/info.html</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
diff --git a/swamid-2.0/akka-adm.test.uu.se-shibboleth.xml b/swamid-2.0/akka-adm.test.uu.se-shibboleth.xml
index 322e692b..733973b9 100644
--- a/swamid-2.0/akka-adm.test.uu.se-shibboleth.xml
+++ b/swamid-2.0/akka-adm.test.uu.se-shibboleth.xml
@@ -12,7 +12,8 @@
         <mdui:DisplayName xml:lang="en">Uppsala University AKKA (TEST)</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Autentisering/Kontroll - Katalogadministration (TEST)</mdui:Description>
         <mdui:Description xml:lang="en">Authentication/Control - Directory Administration (TEST)</mdui:Description>
-        <mdui:Logo height="50" width="50">https://weblogin.test.uu.se/idp/images/logga-50.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="50" width="50">https://weblogin.test.uu.se/idp/images/logga-50.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="50" width="50">https://weblogin.test.uu.se/idp/images/logga-50.png</mdui:Logo>
         <mdui:InformationURL xml:lang="sv">http://akka.uadm.uu.se/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://akka.uadm.uu.se/?languageId=1</mdui:InformationURL>
       </mdui:UIInfo>
diff --git a/swamid-2.0/akka-adm.uu.se-shibboleth.xml b/swamid-2.0/akka-adm.uu.se-shibboleth.xml
index 595a3b01..3964c0b7 100644
--- a/swamid-2.0/akka-adm.uu.se-shibboleth.xml
+++ b/swamid-2.0/akka-adm.uu.se-shibboleth.xml
@@ -12,7 +12,8 @@
         <mdui:DisplayName xml:lang="sv">Uppsala universitets AKKA</mdui:DisplayName>
         <mdui:Description xml:lang="en">Authentication/Control - Directory Administration</mdui:Description>
         <mdui:Description xml:lang="sv">Autentisering/Kontroll - Katalogadministration</mdui:Description>
-        <mdui:Logo height="50" width="50">https://weblogin.uu.se/idp/images/logga-50.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="50" width="50">https://weblogin.uu.se/idp/images/logga-50.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="50" width="50">https://weblogin.uu.se/idp/images/logga-50.png</mdui:Logo>
         <mdui:InformationURL xml:lang="sv">http://akka.uadm.uu.se/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://akka.uadm.uu.se/?languageId=1</mdui:InformationURL>
       </mdui:UIInfo>
diff --git a/swamid-2.0/idpsimplesaml.irf.se-simplesaml-saml2-idp-metadata.php.xml b/swamid-2.0/idpsimplesaml.irf.se-simplesaml-saml2-idp-metadata.php.xml
deleted file mode 100644
index afc7b5df..00000000
--- a/swamid-2.0/idpsimplesaml.irf.se-simplesaml-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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://idpsimplesaml.irf.se/simplesaml/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID+zCCAuOgAwIBAgIJALhO1s60R2mkMA0GCSqGSIb3DQEBCwUAMIGTMQswCQYDVQQGEwJTRTETMBEGA1UECAwKTm9ycmJvdHRlbjEPMA0GA1UEBwwGS2lydW5hMQwwCgYDVQQKDANJUkYxFDASBgNVBAsMC0RhdGFncnVwcGVuMR0wGwYDVQQDDBRpZHBzaW1wbGVzYW1sLmlyZi5zZTEbMBkGCSqGSIb3DQEJARYMbWF0c2xAaXJmLnNlMB4XDTE1MDYyMzE0MjI1NloXDTI1MDYyMjE0MjI1NlowgZMxCzAJBgNVBAYTAlNFMRMwEQYDVQQIDApOb3JyYm90dGVuMQ8wDQYDVQQHDAZLaXJ1bmExDDAKBgNVBAoMA0lSRjEUMBIGA1UECwwLRGF0YWdydXBwZW4xHTAbBgNVBAMMFGlkcHNpbXBsZXNhbWwuaXJmLnNlMRswGQYJKoZIhvcNAQkBFgxtYXRzbEBpcmYuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCTd9QAEXdw+1TFBrVvx39cxp9bEyEnwtDyExIoSjcwGC4hZ4R+eRG2ugqxZHRYc0Q/hth+BXWLrRrdiKavg0l1r6CpoItHsW4vnFOsUDT5SLXibXSG9z/xZdfOT+zRLnvFRAwaeOTdeCTLqDSqwq/1n97fPQ+lYw1iAgAHonxG2yUgtrUS+pqY6LQtZUDhhxdp/khqgd3y7HUk1Xx1nJjeIRErKnw+Oeg6RwOcP58Zop4ZUPAkZ2otmuauj6EKbOmwaQUt7Q9JPfc5ddglcACukEg65ZJ1hcUpLEQTRgBtoBt3efbwpyDXMdB8jloxD+CSO83PvCsmZIUuXiDsFlxFAgMBAAGjUDBOMB0GA1UdDgQWBBSNmkSWaCK9uPfSbhp1tX2dttMBiTAfBgNVHSMEGDAWgBSNmkSWaCK9uPfSbhp1tX2dttMBiTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBEZH6rBUDuY/pC2CaPMY2lE8I7bkuyFWUCCX9KdYEaDwlFJU6X7CVK5ciy4B34/1/VcmJ/ZyOLISAK/APtLr2TW33Q+464vqT3mXmw9+IeXAzWIs5SeTdCREsTlH7C6FLTc0id+AFJglZ2jqfP6zwP0sdciVxRmsHe/j+sJKoXQmPvcex6hL18mFjSYgTi6W7Bt0BW3OwcxleHVrL2f5w3zpcYl7SHD9xN1usUi7azQDD1WdMrfBWanySm8PRlCuA0ibmqDN3E1RzDp7daBoRR8PcnM9NfccV003CNwT3DovHonuP4bFyLRZneb8BFqdD/LiaCgOlS6Qct4fSH4j++</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID+zCCAuOgAwIBAgIJALhO1s60R2mkMA0GCSqGSIb3DQEBCwUAMIGTMQswCQYDVQQGEwJTRTETMBEGA1UECAwKTm9ycmJvdHRlbjEPMA0GA1UEBwwGS2lydW5hMQwwCgYDVQQKDANJUkYxFDASBgNVBAsMC0RhdGFncnVwcGVuMR0wGwYDVQQDDBRpZHBzaW1wbGVzYW1sLmlyZi5zZTEbMBkGCSqGSIb3DQEJARYMbWF0c2xAaXJmLnNlMB4XDTE1MDYyMzE0MjI1NloXDTI1MDYyMjE0MjI1NlowgZMxCzAJBgNVBAYTAlNFMRMwEQYDVQQIDApOb3JyYm90dGVuMQ8wDQYDVQQHDAZLaXJ1bmExDDAKBgNVBAoMA0lSRjEUMBIGA1UECwwLRGF0YWdydXBwZW4xHTAbBgNVBAMMFGlkcHNpbXBsZXNhbWwuaXJmLnNlMRswGQYJKoZIhvcNAQkBFgxtYXRzbEBpcmYuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCTd9QAEXdw+1TFBrVvx39cxp9bEyEnwtDyExIoSjcwGC4hZ4R+eRG2ugqxZHRYc0Q/hth+BXWLrRrdiKavg0l1r6CpoItHsW4vnFOsUDT5SLXibXSG9z/xZdfOT+zRLnvFRAwaeOTdeCTLqDSqwq/1n97fPQ+lYw1iAgAHonxG2yUgtrUS+pqY6LQtZUDhhxdp/khqgd3y7HUk1Xx1nJjeIRErKnw+Oeg6RwOcP58Zop4ZUPAkZ2otmuauj6EKbOmwaQUt7Q9JPfc5ddglcACukEg65ZJ1hcUpLEQTRgBtoBt3efbwpyDXMdB8jloxD+CSO83PvCsmZIUuXiDsFlxFAgMBAAGjUDBOMB0GA1UdDgQWBBSNmkSWaCK9uPfSbhp1tX2dttMBiTAfBgNVHSMEGDAWgBSNmkSWaCK9uPfSbhp1tX2dttMBiTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBEZH6rBUDuY/pC2CaPMY2lE8I7bkuyFWUCCX9KdYEaDwlFJU6X7CVK5ciy4B34/1/VcmJ/ZyOLISAK/APtLr2TW33Q+464vqT3mXmw9+IeXAzWIs5SeTdCREsTlH7C6FLTc0id+AFJglZ2jqfP6zwP0sdciVxRmsHe/j+sJKoXQmPvcex6hL18mFjSYgTi6W7Bt0BW3OwcxleHVrL2f5w3zpcYl7SHD9xN1usUi7azQDD1WdMrfBWanySm8PRlCuA0ibmqDN3E1RzDp7daBoRR8PcnM9NfccV003CNwT3DovHonuP4bFyLRZneb8BFqdD/LiaCgOlS6Qct4fSH4j++</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpsimplesaml.irf.se/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpsimplesaml.irf.se/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Mats</md:GivenName>
-    <md:SurName>Luspa</md:SurName>
-    <md:EmailAddress>mailto:matsl@irf.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/konto.test.uu.se-shibboleth.xml b/swamid-2.0/konto.test.uu.se-shibboleth.xml
index 1cee7f98..4333c4f7 100644
--- a/swamid-2.0/konto.test.uu.se-shibboleth.xml
+++ b/swamid-2.0/konto.test.uu.se-shibboleth.xml
@@ -12,7 +12,7 @@
         <mdui:DisplayName xml:lang="en">Uppsala University user account activation and password reset (TEST)</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Denna tjänst används för att du som ny vid universitetet ska kunna aktivera ditt användarkonto vid universitetet. Om du redan har ett aktivt konto kan du sätta ett nytt lösenord A om du glömt bort det.</mdui:Description>
         <mdui:Description xml:lang="en">As a new user you use this service to activate your university user account. You can also use this service to reset your password A for your user account after the account activation.</mdui:Description>
-        <mdui:Logo height="50" width="50">https://weblogin.test.uu.se/idp/images/logga-50.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="50" width="50">https://weblogin.test.uu.se/idp/images/logga-50.png</mdui:Logo>
         <mdui:Logo xml:lang="sv" height="50" width="50">https://weblogin.test.uu.se/idp/images/logga-50.png</mdui:Logo>
         <mdui:InformationURL xml:lang="sv">https://konto.test.uu.se/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://konto.test.uu.se/index-en.html</mdui:InformationURL>
diff --git a/swamid-2.0/konto.weblogin.uu.se-shibboleth.xml b/swamid-2.0/konto.weblogin.uu.se-shibboleth.xml
index d81bebe5..c8530175 100644
--- a/swamid-2.0/konto.weblogin.uu.se-shibboleth.xml
+++ b/swamid-2.0/konto.weblogin.uu.se-shibboleth.xml
@@ -19,7 +19,8 @@
         <mdui:DisplayName xml:lang="en">Uppsala University user account activation and password reset</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Denna tjänst används för att du som ny vid universitetet ska kunna aktivera ditt användarkonto vid universitetet. Om du redan har ett aktivt konto kan du sätta ett nytt lösenord A om du glömt bort det.</mdui:Description>
         <mdui:Description xml:lang="en">As a new user you use this service to activate your university user account. You can also use this service to reset your password A for your user account after the account activation.</mdui:Description>
-        <mdui:Logo height="50" width="50">https://weblogin.uu.se/idp/images/logga-50.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="50" width="50">https://weblogin.uu.se/idp/images/logga-50.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="50" width="50">https://weblogin.uu.se/idp/images/logga-50.png</mdui:Logo>
         <mdui:InformationURL xml:lang="sv">https://konto.weblogin.uu.se/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://konto.weblogin.uu.se/index-en.html</mdui:InformationURL>
       </mdui:UIInfo>
diff --git a/swamid-2.0/lists-test.its.uu.se-shibboleth.xml b/swamid-2.0/lists-test.its.uu.se-shibboleth.xml
index 7f69232f..d1aeb042 100644
--- a/swamid-2.0/lists-test.its.uu.se-shibboleth.xml
+++ b/swamid-2.0/lists-test.its.uu.se-shibboleth.xml
@@ -17,7 +17,8 @@
         <mdui:DisplayName xml:lang="en">Uppsala University mailing list server (Sympa) TEST</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Uppsala universitet tillhandahåller tjänsten Sympa för att hantera e-postlistor. Tjänsten hanterar e-postlistor för universitetet.</mdui:Description>
         <mdui:Description xml:lang="en">Uppsala University offers the service Sympa to manage mailing lists. The Sympa server handles mailing lists for the university.</mdui:Description>
-        <mdui:Logo height="121" width="150">https://lists-test.its.uu.se/static-sympa/icons/original_logo_sympa.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="121" width="150">https://lists-test.its.uu.se/static-sympa/icons/original_logo_sympa.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="121" width="150">https://lists-test.its.uu.se/static-sympa/icons/original_logo_sympa.png</mdui:Logo>
         <mdui:InformationURL xml:lang="sv">https://mp.uu.se/c/perm/link?p=1265519&amp;l=sv</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://mp.uu.se/c/perm/link?p=1265519&amp;l=en</mdui:InformationURL>
       </mdui:UIInfo>
diff --git a/swamid-2.0/lists.uu.se-shibboleth.xml b/swamid-2.0/lists.uu.se-shibboleth.xml
index e72e8971..b14ba02a 100644
--- a/swamid-2.0/lists.uu.se-shibboleth.xml
+++ b/swamid-2.0/lists.uu.se-shibboleth.xml
@@ -17,7 +17,8 @@
         <mdui:DisplayName xml:lang="sv">Uppsala universitets e-postlistserver (Sympa)</mdui:DisplayName>
         <mdui:Description xml:lang="en">Uppsala University offers the service Sympa to manage mailing lists. The Sympa server handles mailing lists for the university.</mdui:Description>
         <mdui:Description xml:lang="sv">Uppsala universitet tillhandahåller tjänsten Sympa för att hantera e-postlistor. Tjänsten hanterar e-postlistor för universitetet.</mdui:Description>
-        <mdui:Logo height="121" width="150">https://lists.uu.se/static-sympa/icons/original_logo_sympa.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="121" width="150">https://lists.uu.se/static-sympa/icons/original_logo_sympa.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="121" width="150">https://lists.uu.se/static-sympa/icons/original_logo_sympa.png</mdui:Logo>
         <mdui:InformationURL xml:lang="en">https://mp.uu.se/c/perm/link?p=1265519&amp;l=en</mdui:InformationURL>
         <mdui:InformationURL xml:lang="sv">https://mp.uu.se/c/perm/link?p=1265519&amp;l=sv</mdui:InformationURL>
       </mdui:UIInfo>
diff --git a/swamid-2.0/sesam.uu.se-shibboleth.xml b/swamid-2.0/sesam.uu.se-shibboleth.xml
index e5909a94..772b9793 100644
--- a/swamid-2.0/sesam.uu.se-shibboleth.xml
+++ b/swamid-2.0/sesam.uu.se-shibboleth.xml
@@ -12,7 +12,8 @@
         <mdui:DisplayName xml:lang="sv">Uppsala universitets Sesam</mdui:DisplayName>
         <mdui:Description xml:lang="en">Uppsala University Sesam administration of contactless smart card access</mdui:Description>
         <mdui:Description xml:lang="sv">Uppsala universitets Sesam administration av passagerättigheter</mdui:Description>
-        <mdui:Logo height="50" width="50">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="50" width="50">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="50" width="50">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
         <mdui:InformationURL xml:lang="en">https://mp.uu.se/c/perm/link?p=940179&amp;l=en</mdui:InformationURL>
         <mdui:InformationURL xml:lang="sv">https://mp.uu.se/c/perm/link?p=940179&amp;l=sv</mdui:InformationURL>
       </mdui:UIInfo>
diff --git a/swamid-2.0/sesamutvf.its.uu.se-shibboleth.xml b/swamid-2.0/sesamutvf.its.uu.se-shibboleth.xml
index b3769f07..df834c18 100644
--- a/swamid-2.0/sesamutvf.its.uu.se-shibboleth.xml
+++ b/swamid-2.0/sesamutvf.its.uu.se-shibboleth.xml
@@ -12,7 +12,8 @@
         <mdui:DisplayName xml:lang="en">Uppsala University Sesam (TEST)</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Uppsala universitets Sesam (TEST) administration av passagerättigheter</mdui:Description>
         <mdui:Description xml:lang="en">Uppsala University Sesam (TEST) administration of contactless smart card access</mdui:Description>
-        <mdui:Logo height="50" width="50">https://weblogin.test.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="50" width="50">https://weblogin.test.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="50" width="50">https://weblogin.test.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
         <mdui:InformationURL xml:lang="sv">https://mp.uu.se/c/perm/link?p=940179&amp;l=sv</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://mp.uu.se/c/perm/link?p=940179&amp;l=en</mdui:InformationURL>
       </mdui:UIInfo>
diff --git a/swamid-2.0/weblogin.test.uu.se-idp-shibboleth.xml b/swamid-2.0/weblogin.test.uu.se-idp-shibboleth.xml
index c0c1f925..0a878520 100644
--- a/swamid-2.0/weblogin.test.uu.se-idp-shibboleth.xml
+++ b/swamid-2.0/weblogin.test.uu.se-idp-shibboleth.xml
@@ -26,7 +26,6 @@
         <mdui:Description xml:lang="en">The Uppsala University TEST Identity Provider is used by employees and students at the university.</mdui:Description>
         <mdui:InformationURL xml:lang="sv">https://weblogin.test.uu.se</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://weblogin.test.uu.se/english.html</mdui:InformationURL>
-        <mdui:Logo height="50" width="50">https://weblogin.test.uu.se/idp/images/logga-50.png</mdui:Logo>
         <mdui:Logo xml:lang="sv" height="50" width="50">https://weblogin.test.uu.se/idp/images/logga-50.png</mdui:Logo>
         <mdui:Logo xml:lang="en" height="50" width="50">https://weblogin.test.uu.se/idp/images/logga-50.png</mdui:Logo>
         <mdui:PrivacyStatementURL xml:lang="sv">https://weblogin.test.uu.se/#2</mdui:PrivacyStatementURL>
diff --git a/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml b/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml
index 15889989..a71aab68 100644
--- a/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml
+++ b/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml
@@ -26,7 +26,6 @@
         <mdui:Description xml:lang="en">The Uppsala University Identity Provider is used by employees and students at the university.</mdui:Description>
         <mdui:InformationURL xml:lang="sv">https://weblogin.uu.se</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://weblogin.uu.se/english.html</mdui:InformationURL>
-        <mdui:Logo height="50" width="50">https://weblogin.uu.se/idp/images/logga-50.png</mdui:Logo>
         <mdui:Logo xml:lang="sv" height="50" width="50">https://weblogin.uu.se/idp/images/logga-50.png</mdui:Logo>
         <mdui:Logo xml:lang="en" height="50" width="50">https://weblogin.uu.se/idp/images/logga-50.png</mdui:Logo>
         <mdui:PrivacyStatementURL xml:lang="sv">https://weblogin.uu.se/#2</mdui:PrivacyStatementURL>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index 755eca93..dea7bd17 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -13,6 +13,5 @@
   <xi:include href="swamid-2.0/idpv4.lu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sts.vinnova.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/adfs.kb.se-adfs-services-trust.xml"/>
-  <xi:include href="swamid-2.0/shib-idp-2.oru.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/swamid.vr.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 9338151e..aaa1ccbb 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -634,7 +634,9 @@
   <xi:include href="swamid-2.0/disp-test.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/gss-su.nextcloud.dev.safedc.services-apps-user_saml-saml-metadata.xml"/>
   <xi:include href="swamid-2.0/artisan-idp-proxy.sunet.se-sp.xml"/>
+  <xi:include href="swamid-2.0/indico.fysik.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/nextcloud.fysik.su.se-apps-user_saml-saml-metadata.xml"/>
+  <xi:include href="swamid-2.0/nextcloud.fysik.su.se-swamidproxy-nextcloud.xml"/>
   <xi:include href="swamid-2.0/lists-test.its.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/program.portal.chalmers.se.xml"/>
   <xi:include href="swamid-2.0/lmdl756.cs.lth.se-shibboleth.xml"/>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 006e5998..cf6b9dae 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -21,7 +21,6 @@
   <xi:include href="swamid-2.0/kitstidp01.tst.ki.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/shibboleth.umu.se-test.xml"/>
   <xi:include href="swamid-2.0/idp-test.suni.se-adfs-services-trust.xml"/>
-  <xi:include href="swamid-2.0/idpsimplesaml.irf.se-simplesaml-saml2-idp-metadata.php.xml"/>
   <xi:include href="swamid-2.0/ls00002.ad.mah.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/login.tst.ki.se-ipd-shibboleth.xml"/>
   <xi:include href="swamid-2.0/ladok3-00.ladok.umu.se-idp-shibboleth.xml"/>