From 33be2bf2659103450b3327c6de85ff64e3984cb4 Mon Sep 17 00:00:00 2001
From: Björn Mattsson <bjorn@sunet.se>
Date: Tue, 9 Apr 2024 11:03:48 +0200
Subject: SWAMID-4031 Moved indico.chalmers.se into eduGAIN

---
 .../swamid-2.0/indico.chalmers.se-shibboleth.xml   | 91 ----------------------
 .../indico.chalmers.se-shibboleth.xml              | 91 ++++++++++++++++++++++
 2 files changed, 91 insertions(+), 91 deletions(-)
 delete mode 100644 metadata/swamid-2.0/indico.chalmers.se-shibboleth.xml
 create mode 100644 metadata/swamid-edugain/indico.chalmers.se-shibboleth.xml

diff --git a/metadata/swamid-2.0/indico.chalmers.se-shibboleth.xml b/metadata/swamid-2.0/indico.chalmers.se-shibboleth.xml
deleted file mode 100644
index 811ea200..00000000
--- a/metadata/swamid-2.0/indico.chalmers.se-shibboleth.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://indico.chalmers.se/shibboleth">
-  <md:Extensions>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2024-03-18T11:21:22Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Indico</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Indico</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Indico hanterar konferenser, möten och workshops</mdui:Description>
-        <mdui:Description xml:lang="en">Indico manages conferenses, meetings and workshops</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">https://indico.chalmers.se/privacy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://indico.chalmers.se/privacy</mdui:PrivacyStatementURL>
-        <mdui:InformationURL xml:lang="sv">https://indico.chalmers.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://indico.chalmers.se/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFFDCCAvygAwIBAgIUEI6+YiuHQAYKVukVpddh1CikJRswDQYJKoZIhvcNAQEL
-BQAwITEfMB0GA1UEAxMWZGVhY29uLml0YS5jaGFsbWVycy5zZTAeFw0yNDAzMjcx
-MDE3NTBaFw0zNDAzMjUxMDE3NTBaMCExHzAdBgNVBAMTFmRlYWNvbi5pdGEuY2hh
-bG1lcnMuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCbbsogh8Hw
-B4uh0CHiuEdBsODKv4pPCMhpjXmQxjO32yhrnTZrDL3AHKy9Ie7KuiLSaCx9GSvr
-YFGrOdjIcjyBg6RHzTkzPdSt2L1Yks8j/kFeeyOSughDcAOhFgEhE9dIl1j27A/s
-QlJPYNf/9Ks/3wQlU0jPanqbTiWWUNK3WM5b1hgDuhud7i9hjDmG1yfmNrqJSuyG
-bB8P7hpHqeiZzlcyyXhWReTbLWF6ByYMEDWBKPK3pmBOK7P6mAiZrsH3G3SkNRYk
-y8O4Fw3fOR4zVGW1RlR3KFleFFTlSPoXIzYctBNf/LcFPQvtQEhz8aQaUUgbFxPX
-sfYrhwzlrUg133mp0bONtTFuh5eabQoWizDfwegBafyWfbBuMSsn7bVrlDyhMjUR
-Bnd2WFfc86iZ+aK0PZ6KC+4+omQM5GJzVQX8Vmc+j0CQFDuPzbyTMJPTsUc3Ak/S
-WIKp5lw0TzJPEvZTBu91GLfIyscVza5wh+iuw1IK+u0nrQgW+yiWwhkH+CoOQ0O2
-wXJl63NDwxqjtDOVvaKL02uxPr6+7a3iJ/ZjC+l+JB5vaF2RIxs1mr7LotEOn4RF
-3dVIgdDncdM4rMlbv+touTO7Hu7UxOV67aksPYNLoFzkuC+LZUCH/28svCihR++I
-JTG8U7WunIHhp5AYGgGQdbMD9VB96WbInQIDAQABo0QwQjAhBgNVHREEGjAYghZk
-ZWFjb24uaXRhLmNoYWxtZXJzLnNlMB0GA1UdDgQWBBTZh8y+PHwmzx8kfu2qfBiL
-JDWA6TANBgkqhkiG9w0BAQsFAAOCAgEAm1+TGKB4OkXxat6xn+ZTM6KT2nxmnvTe
-mFWxkzE5T7QOawBH2o5PNav80Nu6lLSuoEqDjtNzbAnPvfH518sdxFnCXu+fE0b5
-QHa2P8N87cJ0XnTIUXQJ/im3G0w4rFok6PuRKyAwLgrBLQlieamaYjTebZlTdd9T
-D+tZh1RNjVHsQNfsIkJvtRl4SK6ZqP/G5JqEfOMRCn9yxLvtD4R6GQnvPrbxAK9X
-iEi0wP2XnZ7TF72b7Ej7crGZsQVMNHawtEs6cClf8VXk1ZIMnd6cjBe8UVUe4uwY
-pJPQwD9N/gLQbnPqFD752zso/MVPrE1HKI7qy2ZuqkTVeEgNZoC+2WPczwy5CTgC
-4576RBOrh2dIxA+lZG5Bhtm2OhUXBOJh8Z5D1qUbtLVXPnCdA40TR69OnLLIDwW2
-fLbnEYc6mzehSxLWcabK7Sa4NlS2CvCi/827337fSRt94+XmM/4d+nD4CREtwGBm
-PLWI69tH5klwiyehTfLfZZmmcC29/j5S34NL0EY7zwqzoVw/0J+Qiyb0K9gYPAA/
-WE/NGPLUedc112zqmVWJGLQiqb4g/tc/OrpIW7LHpeICwPSJFmiIXsM14dtFo4EB
-eeQxQRABdnXtpr7qxNvy3koOw3MRKr+WwrxkhAvv7iypdt41LQYNLpmtuQXqrTMr
-7cxZzrhyJto=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://indico.chalmers.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://indico.chalmers.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://indico.chalmers.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Chalmers University of Technology</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Chalmers Tekniska Högskola</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Chalmers</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Chalmers</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.chalmers.se/en/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.chalmers.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:SurName>IT-support</md:SurName>
-    <md:EmailAddress>mailto:it-support@chalmers.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Chalmers Incident Response Team</md:GivenName>
-    <md:EmailAddress>mailto:abuse@chalmers.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 31 772 8450</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Andreas</md:GivenName>
-    <md:SurName>Jonasson</md:SurName>
-    <md:EmailAddress>mailto:andreas@chalmers.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ulf</md:GivenName>
-    <md:SurName>Andersson</md:SurName>
-    <md:EmailAddress>mailto:ulf.s.andersson@chalmers.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-edugain/indico.chalmers.se-shibboleth.xml b/metadata/swamid-edugain/indico.chalmers.se-shibboleth.xml
new file mode 100644
index 00000000..811ea200
--- /dev/null
+++ b/metadata/swamid-edugain/indico.chalmers.se-shibboleth.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://indico.chalmers.se/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes>
+      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2024-03-18T11:21:22Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Indico</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Indico</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Indico hanterar konferenser, möten och workshops</mdui:Description>
+        <mdui:Description xml:lang="en">Indico manages conferenses, meetings and workshops</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">https://indico.chalmers.se/privacy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://indico.chalmers.se/privacy</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="sv">https://indico.chalmers.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://indico.chalmers.se/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFFDCCAvygAwIBAgIUEI6+YiuHQAYKVukVpddh1CikJRswDQYJKoZIhvcNAQEL
+BQAwITEfMB0GA1UEAxMWZGVhY29uLml0YS5jaGFsbWVycy5zZTAeFw0yNDAzMjcx
+MDE3NTBaFw0zNDAzMjUxMDE3NTBaMCExHzAdBgNVBAMTFmRlYWNvbi5pdGEuY2hh
+bG1lcnMuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCbbsogh8Hw
+B4uh0CHiuEdBsODKv4pPCMhpjXmQxjO32yhrnTZrDL3AHKy9Ie7KuiLSaCx9GSvr
+YFGrOdjIcjyBg6RHzTkzPdSt2L1Yks8j/kFeeyOSughDcAOhFgEhE9dIl1j27A/s
+QlJPYNf/9Ks/3wQlU0jPanqbTiWWUNK3WM5b1hgDuhud7i9hjDmG1yfmNrqJSuyG
+bB8P7hpHqeiZzlcyyXhWReTbLWF6ByYMEDWBKPK3pmBOK7P6mAiZrsH3G3SkNRYk
+y8O4Fw3fOR4zVGW1RlR3KFleFFTlSPoXIzYctBNf/LcFPQvtQEhz8aQaUUgbFxPX
+sfYrhwzlrUg133mp0bONtTFuh5eabQoWizDfwegBafyWfbBuMSsn7bVrlDyhMjUR
+Bnd2WFfc86iZ+aK0PZ6KC+4+omQM5GJzVQX8Vmc+j0CQFDuPzbyTMJPTsUc3Ak/S
+WIKp5lw0TzJPEvZTBu91GLfIyscVza5wh+iuw1IK+u0nrQgW+yiWwhkH+CoOQ0O2
+wXJl63NDwxqjtDOVvaKL02uxPr6+7a3iJ/ZjC+l+JB5vaF2RIxs1mr7LotEOn4RF
+3dVIgdDncdM4rMlbv+touTO7Hu7UxOV67aksPYNLoFzkuC+LZUCH/28svCihR++I
+JTG8U7WunIHhp5AYGgGQdbMD9VB96WbInQIDAQABo0QwQjAhBgNVHREEGjAYghZk
+ZWFjb24uaXRhLmNoYWxtZXJzLnNlMB0GA1UdDgQWBBTZh8y+PHwmzx8kfu2qfBiL
+JDWA6TANBgkqhkiG9w0BAQsFAAOCAgEAm1+TGKB4OkXxat6xn+ZTM6KT2nxmnvTe
+mFWxkzE5T7QOawBH2o5PNav80Nu6lLSuoEqDjtNzbAnPvfH518sdxFnCXu+fE0b5
+QHa2P8N87cJ0XnTIUXQJ/im3G0w4rFok6PuRKyAwLgrBLQlieamaYjTebZlTdd9T
+D+tZh1RNjVHsQNfsIkJvtRl4SK6ZqP/G5JqEfOMRCn9yxLvtD4R6GQnvPrbxAK9X
+iEi0wP2XnZ7TF72b7Ej7crGZsQVMNHawtEs6cClf8VXk1ZIMnd6cjBe8UVUe4uwY
+pJPQwD9N/gLQbnPqFD752zso/MVPrE1HKI7qy2ZuqkTVeEgNZoC+2WPczwy5CTgC
+4576RBOrh2dIxA+lZG5Bhtm2OhUXBOJh8Z5D1qUbtLVXPnCdA40TR69OnLLIDwW2
+fLbnEYc6mzehSxLWcabK7Sa4NlS2CvCi/827337fSRt94+XmM/4d+nD4CREtwGBm
+PLWI69tH5klwiyehTfLfZZmmcC29/j5S34NL0EY7zwqzoVw/0J+Qiyb0K9gYPAA/
+WE/NGPLUedc112zqmVWJGLQiqb4g/tc/OrpIW7LHpeICwPSJFmiIXsM14dtFo4EB
+eeQxQRABdnXtpr7qxNvy3koOw3MRKr+WwrxkhAvv7iypdt41LQYNLpmtuQXqrTMr
+7cxZzrhyJto=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://indico.chalmers.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://indico.chalmers.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://indico.chalmers.se/Shibboleth.sso/SAML2/ECP" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Chalmers University of Technology</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Chalmers Tekniska Högskola</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Chalmers</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Chalmers</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.chalmers.se/en/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.chalmers.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:SurName>IT-support</md:SurName>
+    <md:EmailAddress>mailto:it-support@chalmers.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Chalmers Incident Response Team</md:GivenName>
+    <md:EmailAddress>mailto:abuse@chalmers.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 31 772 8450</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Andreas</md:GivenName>
+    <md:SurName>Jonasson</md:SurName>
+    <md:EmailAddress>mailto:andreas@chalmers.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ulf</md:GivenName>
+    <md:SurName>Andersson</md:SurName>
+    <md:EmailAddress>mailto:ulf.s.andersson@chalmers.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
-- 
cgit v1.2.3