meta.eduroam.se is replaced by meta2.eduroam.se

Signed-off by khn

2 files changed, 0 insertions, 96 deletions

diff --git a/swamid-2.0/meta.eduroam.se.xml b/swamid-2.0/meta.eduroam.se.xml
deleted file mode 100644
index 6731a74f..00000000
--- a/swamid-2.0/meta.eduroam.se.xml
+++ /dev/null
@@ -1,95 +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://meta.eduroam.se">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-03-24T13:19:12Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://meta.eduroam.se/Shibboleth.sso/DS/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://meta.eduroam.se/Shibboleth.sso/DS/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">eduroam meta</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">eduroam meta</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Detta är Sveriges nya eduroam metadata hanteringsverktyg</mdui:Description>
-        <mdui:Description xml:lang="en">This is the new eduroam metadata management system for Sweden</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="115" width="50">https://meta.eduroam.se/static/img/eduroam_logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="115" width="50">https://meta.eduroam.se/static/img/eduroam_logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>meta.eduroam.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=meta.eduroam.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJAPxbtJJgj8+DMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD21ldGEuZWR1cm9hbS5zZTAeFw0xNzAzMjQxMTM2MDlaFw0yNzAzMjIxMTM2
-MDlaMBoxGDAWBgNVBAMTD21ldGEuZWR1cm9hbS5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAJiUJnvTlXFvlPhqHlUvGuTwTKl9lmAeap37RKonVMtB
-gGa+UV4lJ5I4vZqmo1GqBq3/YWwQTTAyQkdE4rZR5fpLYnfe0L/a8IPuVuq4U7YX
-cGj4ArShzOOCEtVRFfqUfZoe0g4YzPVCKpD7M+kYUnCIQYcBwc4aMVcKHGCCJWMG
-gssYjoQ3R4cpDten4++bApaOUqNP8YeWTe24PPSPqUA18ocqPeuONPsynnVUzZaO
-jF30687QTEWi7mLixnCskTxX/d3HzUj6B+X2nUI/7HfOEWTGF00smiGN7Y7UZkIm
-XJfgpYvNUkvmiWEUzUi5ZsGECd7GdeS7mZCeZOI3sUUCAwEAAaM9MDswGgYDVR0R
-BBMwEYIPbWV0YS5lZHVyb2FtLnNlMB0GA1UdDgQWBBRI4mYILiY8u0TWHOjSwnSu
-8sBqCjANBgkqhkiG9w0BAQUFAAOCAQEAO/R5fMGks2QvEYGqP8sWZEh8Mcb6+rWr
-m/WqKx4qKLiFHOE5IgDRoozQtzxSC8mroowvQhO1QuX1eb2+kmNxLYdBxWaO/Afu
-4t5PhvbiFbxm5pa3UG+fSEnRIVoANc1aSUFREYqGw76vUxL9AgWHhZj7yk7PwDAr
-qVwd3QyMOJookxU52F2tKfh6Ycvj19U+hZh95R8ItW0PSGNllsxPayIdpt2voZM5
-mReDC+W3lhFUIiep/tdMa2FQmxvBfXpwWP/xxgdNLQHhUAYigMCyWvIeTdMsw5Cd
-n1KiEHawTUUJfngoFN0QtwwvnExeTkUoAOa6ZYr5BscvnB9xKgaDgw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <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://meta.eduroam.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meta.eduroam.se/Shibboleth.sso/Artifact/SOAP" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meta.eduroam.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://meta.eduroam.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meta.eduroam.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meta.eduroam.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meta.eduroam.se/Shibboleth.sso/SAML2/POST" index="1"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Paul</md:GivenName>
-    <md:SurName>Scott</md:SurName>
-    <md:EmailAddress>mailto:paul.scott@kau.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Anders</md:GivenName>
-    <md:SurName>Nilsson</md:SurName>
-    <md:EmailAddress>mailto:anders.nilsson@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index ec5b10ae..a0a10bd5 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -54,7 +54,6 @@
   <xi:include href="swamid-2.0/sp-test.it.su.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/epc.ub.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.wisum.its.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/meta.eduroam.se.xml"/>
   <xi:include href="swamid-2.0/meta2.eduroam.se.xml"/>
   <xi:include href="swamid-2.0/play.sunet.se.xml"/>
   <xi:include href="swamid-2.0/nagios.nordu.net-shibboleth.xml"/>