SWAMID-233, Plocka bort sp.swamid.se ur SWAMID

5 files changed, 0 insertions, 133 deletions

diff --git a/sp-with-simplesign b/sp-with-simplesign
index c706344b..cdd6722d 100644
--- a/sp-with-simplesign
+++ b/sp-with-simplesign
@@ -118,7 +118,6 @@ sp-nya.bth.se-shibboleth.xml
 sp-test.it.su.se-shibboleth.sso.xml
 sp.it.gu.se-shibboleth.xml
 sp.spraakbanken.gu.se-shibboleth.xml
-sp.swamid.se-shibboleth.xml
 sp.tools.sunet.se-shibboleth.xml
 su.avedas.com-shibboleth.xml
 swamid2.shh.se-idp-shibboleth.xml
diff --git a/swamid-2.0/sp.swamid.se-shibboleth.xml b/swamid-2.0/sp.swamid.se-shibboleth.xml
deleted file mode 100644
index d05b8b83..00000000
--- a/swamid-2.0/sp.swamid.se-shibboleth.xml
+++ /dev/null
@@ -1,129 +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://sp.swamid.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <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://www.swamid.se/category/nren-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </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>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.swamid.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.swamid.se/Shibboleth.sso/DS/ds.sunet.se" index="2"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">SWAMID Test SP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fr">SWAMID Test SP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SWAMID Test SP</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Detta är en applikation som låter dig testa federerad inloggning.</mdui:Description>
-        <mdui:Description xml:lang="en">This is an application for testing federated authentication.</mdui:Description>
-        <mdui:Description xml:lang="fr">Il s'agit d'une application pour tester l'authentification fédérée.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.swamid.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.swamid.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="fr">http://www.swamid.se/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>https://sp.swamid.se/shibboleth</ds:KeyName>
-        <ds:KeyName>sp.swamid.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sp.swamid.se</ds:X509SubjectName>
-          <ds:X509Certificate>
-MIID6zCCAlOgAwIBAgIJAMm4grAs3DTpMA0GCSqGSIb3DQEBCwUAMBcxFTATBgNV
-BAMTDHNwLnN3YW1pZC5zZTAeFw0xOTAxMjUxNjU2NDZaFw0yOTAxMjIxNjU2NDZa
-MBcxFTATBgNVBAMTDHNwLnN3YW1pZC5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGP
-ADCCAYoCggGBANm56scHm0CY7xoIeowuVht1DNfB8RC6sxGoxwOEciqgaNFs4hDC
-6sgecXSpRf1Qh+3PCZk5htPxDUW+gOk+Tto6GAlqYpisHxlml6eKdvjOe2IADE9J
-4lbY/RuuHg0wuRlx/pjAxLkg7+i1wxCB+XxR3DCI91JnSZHtmEc9pH7VH2RmdyCC
-7Y+LnUhL6YYKO9aN6TdJCABDgj4cwSSxJe68lu+uJ+sXefPkxE1DW5FCnmPWdm94
-1Lk9CobAcrk9xtLKHX4Bk5kcFUD86eX+vltUQh3ccsfR84CzzKgAZk9Trozz5K5T
-1XcW1svMxGBZiQ0AkWxR9eO8oRdDdCMScVTT5mJZRofotPCUx+/wvGPoDwWvdy2q
-L6cXPjeYHWLZAooPPKQE42iNJZiXITj0w/wjOfelqnuqqfuTzHPfKRQik2VzUUCi
-tMxoxX/oolhLxJkSYNMSyuF7+Alv8Q0WqLBO67zSAyYIqE80SAwJO6/LYCMRwixV
-K52lwqfzFinBKQIDAQABozowODAXBgNVHREEEDAOggxzcC5zd2FtaWQuc2UwHQYD
-VR0OBBYEFHosT4IJ06X07vl5/PzJpZ5lGjXYMA0GCSqGSIb3DQEBCwUAA4IBgQDE
-6KJil3ylmDi9V7JNMpcA+APRKyt9c/PngKWAL2XjVQv3tlBfK71NVcUU4nvKqduS
-jVbklFjx5jXnOQ6tZGe8jxaTKLqyn0HqfwPDsf5ulcgT0rpmgl4/cnLweowQLiQ0
-9XxU+KzGgBT6LFb4uRf1Y6saLmYr1dT8eAd0DL/7XtE02aQQilyNTG0+JnZ0lnlw
-8/n/3TOVaVX0qn2w7bKexh6RoWW8rVIcJpII4sclA558JpRGvDJemF4JjxSd/t5L
-LQ8oPCcnDOAEWLrlBmH0WBLoHXvAOV3frb6dG2kgsWFYLVwf3sL/Fe47MnfZt6NP
-4WUbN04MdErxm64E+g7kBPYKZew1gPBmBumMmSEhVngDKNoGO3OebAaWFfLoPaoI
-4maNJQuR4uQMZ+FCXFlnExx8fdTCCTqhCBnpn53RZ8cMrWtRocvCMP75mJ15rccR
-oAUJwZp3x5rWpywOLd3MMr2hxEi/ZK4uq//9eZv/pTEhWrI3fSqFkg6LXo2iub8=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>https://sp.swamid.se/shibboleth</ds:KeyName>
-        <ds:KeyName>sp.swamid.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sp.swamid.se</ds:X509SubjectName>
-          <ds:X509Certificate>
-MIID6zCCAlOgAwIBAgIJAMm4grAs3DTpMA0GCSqGSIb3DQEBCwUAMBcxFTATBgNV
-BAMTDHNwLnN3YW1pZC5zZTAeFw0xOTAxMjUxNjU2NDZaFw0yOTAxMjIxNjU2NDZa
-MBcxFTATBgNVBAMTDHNwLnN3YW1pZC5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGP
-ADCCAYoCggGBANm56scHm0CY7xoIeowuVht1DNfB8RC6sxGoxwOEciqgaNFs4hDC
-6sgecXSpRf1Qh+3PCZk5htPxDUW+gOk+Tto6GAlqYpisHxlml6eKdvjOe2IADE9J
-4lbY/RuuHg0wuRlx/pjAxLkg7+i1wxCB+XxR3DCI91JnSZHtmEc9pH7VH2RmdyCC
-7Y+LnUhL6YYKO9aN6TdJCABDgj4cwSSxJe68lu+uJ+sXefPkxE1DW5FCnmPWdm94
-1Lk9CobAcrk9xtLKHX4Bk5kcFUD86eX+vltUQh3ccsfR84CzzKgAZk9Trozz5K5T
-1XcW1svMxGBZiQ0AkWxR9eO8oRdDdCMScVTT5mJZRofotPCUx+/wvGPoDwWvdy2q
-L6cXPjeYHWLZAooPPKQE42iNJZiXITj0w/wjOfelqnuqqfuTzHPfKRQik2VzUUCi
-tMxoxX/oolhLxJkSYNMSyuF7+Alv8Q0WqLBO67zSAyYIqE80SAwJO6/LYCMRwixV
-K52lwqfzFinBKQIDAQABozowODAXBgNVHREEEDAOggxzcC5zd2FtaWQuc2UwHQYD
-VR0OBBYEFHosT4IJ06X07vl5/PzJpZ5lGjXYMA0GCSqGSIb3DQEBCwUAA4IBgQDE
-6KJil3ylmDi9V7JNMpcA+APRKyt9c/PngKWAL2XjVQv3tlBfK71NVcUU4nvKqduS
-jVbklFjx5jXnOQ6tZGe8jxaTKLqyn0HqfwPDsf5ulcgT0rpmgl4/cnLweowQLiQ0
-9XxU+KzGgBT6LFb4uRf1Y6saLmYr1dT8eAd0DL/7XtE02aQQilyNTG0+JnZ0lnlw
-8/n/3TOVaVX0qn2w7bKexh6RoWW8rVIcJpII4sclA558JpRGvDJemF4JjxSd/t5L
-LQ8oPCcnDOAEWLrlBmH0WBLoHXvAOV3frb6dG2kgsWFYLVwf3sL/Fe47MnfZt6NP
-4WUbN04MdErxm64E+g7kBPYKZew1gPBmBumMmSEhVngDKNoGO3OebAaWFfLoPaoI
-4maNJQuR4uQMZ+FCXFlnExx8fdTCCTqhCBnpn53RZ8cMrWtRocvCMP75mJ15rccR
-oAUJwZp3x5rWpywOLd3MMr2hxEi/ZK4uq//9eZv/pTEhWrI3fSqFkg6LXo2iub8=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.swamid.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.swamid.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.swamid.se/Shibboleth.sso/SLO/Redirect"/>
-    <!-- md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.swamid.se/Shibboleth.sso/SLO/POST"/ -->
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.swamid.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.swamid.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.swamid.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.swamid.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.swamid.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.swamid.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.swamid.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.swamid.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <!-- md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.swamid.se/Shibboleth.sso/SAML2/ECP" index="4"/ -->
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.swamid.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.swamid.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">SWAMID Test SP</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">SWAMID Test SP</md:ServiceDescription>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>SWAMID</md:Company>
-    <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-edugain-sp-1.0.mxml b/swamid-edugain-sp-1.0.mxml
index 2bcd8c6b..d5e92493 100644
--- a/swamid-edugain-sp-1.0.mxml
+++ b/swamid-edugain-sp-1.0.mxml
@@ -3,7 +3,6 @@
   <xi:include href="swamid-2.0/connect.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/connect-beta.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/webinar.nordu.net-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/sp.swamid.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml"/>
   <xi:include href="swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml"/>
diff --git a/swamid-edugain-testing-1.0.mxml b/swamid-edugain-testing-1.0.mxml
index 85937d11..fa19f21f 100644
--- a/swamid-edugain-testing-1.0.mxml
+++ b/swamid-edugain-testing-1.0.mxml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <md:EntitiesDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xi="http://www.w3.org/2001/XInclude" Name="http://md.swamid.se/md/swamid-kalmar-1.0.xml" validUntil="1970-01-01T00:00:00Z" cacheDuration="PT2H">
   <xi:include href="swamid-2.0/connect.sunet.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/sp.swamid.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.nordu.net-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 89f95241..ab11d373 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -36,7 +36,6 @@
   <xi:include href="swamid-2.0/portal.medicinskaforeningen.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
   <xi:include href="swamid-2.0/se.timeedit.net-umu-employee-sp.xml"/>
   <xi:include href="swamid-2.0/se.timeedit.net-umu-student-sp.xml"/>
-  <xi:include href="swamid-2.0/sp.swamid.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/shib1.oru.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sp-nya.bth.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/accountcheckout.lnu.se.xml"/>