2 files changed, 13 insertions, 66 deletions
diff --git a/swamid-2.0/gitlab.speech.humlab.umu.se.xml b/swamid-2.0/gitlab.speech.humlab.umu.se.xml
deleted file mode 100644
index 239f487e..00000000
--- a/swamid-2.0/gitlab.speech.humlab.umu.se.xml
+++ /dev/null
@@ -1,54 +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://gitlab.speech.humlab.umu.se">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-12-07T08:23:16Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Humlab Speech</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Humlab Speech</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Humlabs infrastruktur för taldata</mdui:Description>
-        <mdui:Description xml:lang="en">Humlab infrastructure for speech data</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://speech.humlab.umu.se/om</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://speech.humlab.umu.se/about</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFZTCCA02gAwIBAgIUIeUiHv3nOcACNy6RasqJRQsPZQQwDQYJKoZIhvcNAQELBQAwQjELMAkGA1UEBhMCWFgxFTATBgNVBAcMDERlZmF1bHQgQ2l0eTEcMBoGA1UECgwTRGVmYXVsdCBDb21wYW55IEx0ZDAeFw0yMDEyMDMxNjEzMjRaFw0zMDEyMDExNjEzMjRaMEIxCzAJBgNVBAYTAlhYMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxHDAaBgNVBAoME0RlZmF1bHQgQ29tcGFueSBMdGQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCjBiLso4/FyBDNw4McVDgzbDhoBF8whd4uGQcztvj3OqYURQd7NbZ7NKyfiO8tdw7coJr4cN1QfMWHRj5UFu0VChu6P7h91D6tI8d1/n2NhRNRY24NHdmrN4YZae4sz8q6vK/85VCDUuoGxN6ERyR8so4GMc+TBFUSW6qR9Pnino5MgGpSoMrOZzNUpgbosFdum0LjNh+eDsJJidMDWpLe4Kb/hwhDnAFmSX8oolhy16xv3pGDVkJ1sxyn2JlnHpdDEC5DcqPnE2HTIJAqTNK3FwlD6aVqIkW+Sp7TGwWPdCPVFLxaC1hOBOsqHrejh+XwNlkZvUfaW3JfMvbOiqQdNKsSJ0ifSqZ/hXyc2kFNP3kyZYd/5n8wzjy5sxPY3n84I1BgIXuQHACkwTUxzCZF5ACOb317337LOGRwtQVRxU0AnA45IA8aomaoLgVRlKpssAplJGRgkoZf8nBGh4KgNS9rhQoeGxqXfB1Rgm7e9nqwiA9njWOFxI9QL5V3octNc4BAJQ24DKRFcoYddN4Z+MAbikdqLtP1Nq/ZYUvNP2737577beEBh6bFhehNA1B1OES/bvBsX5qIPIoVnxhQI1Ee8sfEiFX4agVuA/H6/Z2OxypL2yl6QzwhyQLeNcN0XTzItWWtR2kLyayK8vCn+Bp2DOv6xWrpj+zy4jNcjQIDAQABo1MwUTAdBgNVHQ4EFgQUuJxz/nF8jK/8gab/0yVu2G/doVUwHwYDVR0jBBgwFoAUuJxz/nF8jK/8gab/0yVu2G/doVUwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAAEE2B3k2hPxJlMaE3gQVSLJiOWOCOo/ApzsLNwkjdkaIwjtDCMkHNvJ9V7PFbD7QAfWVKaPOqtYadqBNgMPp/195V4kEBMvFFT4TyYuj/pPBA0ukY06aXMCtBgZSLnUiYyypNI2TW+Nhz2t1mpGuXwwV7wpPgk14wW/Sfw88gAsQMXxCg5BCxBfLh2IE22c7rbeR/WjVtLyUV9Dmp/mAfxoYBp9+TsrAzfXF+/xI77bYbCzKGZy1cAIEq8GYmTtPLhdJG07X5Acm42s+OokxRHhUxcZjpr2cZG5T4h17e2t46EbVI7ZcTY39ZewEiDMM4n0HRN5DYz7QHLYEjcYiGPaKAYJP8TRLMDYwgoGlqlk/agvkYvAQ3cHmd8Xj7LgHUmswsGCnn7DEp2nnLn4lj0cwnAhA55RV1oyDqKP4Dq1GmoEFJ+qY3S1vs+llzaTlE3RaWKoYwnPauo7egKaDWq7gklzf0MfE0PGCV0eIIjBkO0KPZS+x06k52nIY8guS4+mGqh6KJqzB4WdoC2ockolnM7z6aMJTvgYp2Gotklv/OPtf/PYNdYyBShyZgxP+meReld/1ljZVc+AIA7fzsUJv3cE2MVyTOPNNv0lyuFOLPxV+jK/YP7YNYrx1ytHg0j8shQvDeNFOnWxelsmSnfQMfAA1hk2tqwQBSOBunNA=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gitlab.speech.humlab.umu.se/users/auth/saml/callback" index="0" isDefault="true"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="en">Required attributes</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">UMU</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">UMU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Umeå universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Umeå University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://umu.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://umu.se/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Johan von Boer</md:GivenName>
-    <md:EmailAddress>mailto:johan.von.boer@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Humlab Support</md:GivenName>
-    <md:EmailAddress>mailto:support@humlab.umu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/speech.humlab.umu.se.xml b/swamid-2.0/visp.humlab.umu.se.xml
index 9e61e608..463a0aba 100644
--- a/swamid-2.0/speech.humlab.umu.se.xml
+++ b/swamid-2.0/visp.humlab.umu.se.xml
@@ -1,7 +1,7 @@
 <?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://speech.humlab.umu.se">
+<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://visp.humlab.umu.se">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-12-07T08:23:16Z">
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-05-20T15:11:37Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
@@ -13,25 +13,25 @@
   <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Humlab Speech</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Humlab Speech</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Humlabs infrastruktur för taldata</mdui:Description>
-        <mdui:Description xml:lang="en">Humlab infrastructure for speech data</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://speech.humlab.umu.se/om</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://speech.humlab.umu.se/about</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="sv">Visual Speech</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Visual Speech</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Humlabs infrastruktur för ett online forskningsflöde gällande taldata</mdui:Description>
+        <mdui:Description xml:lang="en">Humlab infrastructure for an online research flow regarding speech data</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://visp.humlab.umu.se/om</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://visp.humlab.umu.se/about</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
-        <ds:KeyName>BKHjLT8NgTRfNCUVJiOpyiCrnpmTUlho-XHYqd8b9Vk</ds:KeyName>
+        <ds:KeyName>0PQfnivR2RVYiqXlu8CrQK1BtYByPOxvgQrAS_JIsfk</ds:KeyName>
         <ds:X509Data>
-          <ds:X509Certificate>MIIClzCCAX8CBgF2KVjjCDANBgkqhkiG9w0BAQsFADAPMQ0wCwYDVQQDDARoaXJkMB4XDTIwMTIwMzE2MDIzOVoXDTMwMTIwMzE2MDQxOVowDzENMAsGA1UEAwwEaGlyZDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKhyX+NzfVemzISAzhLWuPUkAqMD3T80b7AYzP6D9BNcvdmSckaWpJr5msM7t1aci2XIx/JsVvl/nz06J3E5GRDRcbcwWw5RsXeggDnvh7aJgOzivH5KBG7oXlq3r7zTqS6mqhNvImwrdz24pwfZkSTJ+ENmvSpVezHxdcaek6I7NZnHVrtfuDe/5bzv14HbzABYi57Rn1+HeeG8ENwZhBS3/25mVPFtVlMQKkMFFb5cyvKhf3BQtP+lh1nRLIJXeiaWi9S6pdqGsbpsMMF5ZpoEowQ8l2i1mS6lvFnxQI9hJFXdfHVfIUa0zyqz+qmu7uoqqdefRNEt2CPIaqNBHbUCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAKhP9DUcaoNonzD8rOZFhARScmXB6mPvD6GQqk9bDKfSZ8OWRdZ6z+nsom0sSoMzLdb1IZETX2ulhbGazY+5T3A9RYue/kxJe01PS5AGWGvxkoewgAnI0f1k+AlI9pS9sSskLd07ZLPjptqwngA6E0z5M9LwXg+YnfmeIt/0WPOyHzZx+LRCBO/jzYfXb9HJgrRGKau7SL173FsFtJEACskIViGrYDC374u3zBrr7eW+q7Fkl7kHZNmo94Pa/pYsfgVnjbFNWeMoDjl9XqKWLeGA1Im19MtxbesETVSGiadFslS+xpWbRqk1bBTMTEQqo6fVqTvuZ8kaQ/MW66uQ9Pw==</ds:X509Certificate>
+          <ds:X509Certificate>MIIElzCCAn8CBgF5iZbj7TANBgkqhkiG9w0BAQsFADAPMQ0wCwYDVQQDDAR2aXNwMB4XDTIxMDUyMDExNDIxN1oXDTMxMDUyMDExNDM1N1owDzENMAsGA1UEAwwEdmlzcDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJXmCrgRn/oFlK5cc4GXIktviAohU3REKmgoMCwIt90iH0b7y7LVQHn+18cVCN5uzpB6wDYQ8kjKWvn3VMH6Ytep4pdUoPbntJH6cqU5hSVY/AQ98u98FwfK8glHPTR8lRikcD2hfFsmwfHwAMVpiYBbYE15YnZpVZpaEI98cP6bEy4iJ4ya+LkKbrXZZUHtoOD4QXGeIfGGMlnBZ9Vc4DvtQbRdpunIeg02T0WcNrJ6l463DPn+qbzo1u/e8MrnXvLEw8z7rAH9/BzrgOWfedwgYkSdwMsFyRvDP+XAaOxdglQmlb9jiHf/vNUN6fPOFhtASyfpq1gyZpdjBFWztm1O1adHdx2wpCW++pnsslBD3a45/ovI5djQQcJtu+syTaZl+ewAE6l8v27F25LvfE0N4s9z3E4XS+PGapzR3RKD/WGSIb1UnihG09WpnFVFmAXwiPiP9nxQ3XOrdAmr7XXit0EBBKOjUDOOwzgBOyzHWU1Btiw1a9Xsekd9qrjS28VXqwG9THxzFGutOpHyrFu0MpmJsKH7LV2xrgkFQDKYOCNp1pjGrPHk4Xc8/7Us27X6jWo6PV15VAzJKtbMieUUZUKxepXSPcWfENHB8Uj725Hl6I+cnmTEJomrbJucSKKAqFLvDrxGQbYdco7XZXGwApKM9/votNcFOxFdGa0vAgMBAAEwDQYJKoZIhvcNAQELBQADggIBABw3owbhcCqmUeQODM7+e4u+lrCc0T3etBFdyjFqFsiI4v7RMpllKWldX/4JyQ1bRgVfdokKPTnDhL6sJyBJYyCvlCeiC4xa5xbm3Ui0AjodITNX9DzNmYIMi67RmQ39SmoC0/D0HsMRe/ybfpreoQhF15xQK+LG+BJ1kwgTyB655oE/1Bx/+y0kS3sGG/LeDomQ6PXEZoerftKeWDMwVWadBdngX6x50FOVJFDeJaDM5l3tfXG7OEyRKBYkK/Z+QT5caLGmFFKHaUzSIwhcwHOEsFAux76omD37k3twkSlRIC1ZoS80yRDxYsMi6E/Fgy06BRKFpaDbniNMwN6l6DqzAPGK6wFjkoBbjbyWnUDPuEls7RrTVT/VBtlFOMmILIdM1uXgVgMLXmqwcuFiYdYWC4i7WTJh2mQSQMnwg9S7hhdCGmLZH4hmFegIx/1siM2Ce5WUK9nG5jsfhfOS1hIt8EKruCDv+yrWcgn+NiPA5y5q+o8JeY3CDSKM/Al8bOr7TxNNkiwPKpsizHBFmDvIt8de+SCgwVSBsgpGd/XKol0LvMeI1nifs4DMxrdXPXBGpjoEGE95EO5l6T+ch/UpZTFacV+ICfEwPYr/9B3c96tqhaA1cY36/7KUxD59NkUnyRXpnZcpQ3nBSYFNKLuijbCkMvbSfQUqY4hDfFxA</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.speech.humlab.umu.se/auth/realms/hird/broker/Umu-id/endpoint"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.visp.humlab.umu.se/auth/realms/visp/broker/Umu-id/endpoint"/>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.speech.humlab.umu.se/auth/realms/hird/broker/Umu-id/endpoint" isDefault="true" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.visp.humlab.umu.se/auth/realms/visp/broker/Umu-id/endpoint" isDefault="true" index="1"/>
     <md:AttributeConsumingService index="1" isDefault="true">
       <md:ServiceName xml:lang="en">Required attributes</md:ServiceName>
       <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
@@ -42,6 +42,7 @@
     <md:OrganizationName xml:lang="en">Umeå University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Umeå universitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Umeå University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://umu.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://umu.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">