SWAMID-873, Removed old entities for chalmers.se

7 files changed, 0 insertions, 295 deletions

diff --git a/sp-with-simplesign b/sp-with-simplesign
index 0fea37a0..9fb6e47a 100644
--- a/sp-with-simplesign
+++ b/sp-with-simplesign
@@ -86,7 +86,6 @@ nagios-vm.nordu.net-shibboleth.xml
 nagios.nordu.net-shibboleth.xml
 ni.nordu.net-shibboleth.xml
 nordushare-dev.nordu.net-shibboleth.xml
-pingpong.chalmers.se-shibboleth.xml
 pingpong.ki.se-shibboleth.xml
 portal.mdh.se-shibboleth.xml
 referens-idp.skolfederation.se-idp-shibboleth.xml
@@ -114,7 +113,6 @@ sp.tools.sunet.se-shibboleth.xml
 su.avedas.com-shibboleth.xml
 swamid2.shh.se-idp-shibboleth.xml
 tcs-test.sunet.se-shibboleth.xml
-test-chalmers.pingpong.net-shibboleth.xml
 test-ki.pingpong.net-shibboleth.xml
 test.mp.uu.se-Shibboleth.sso.xml
 testshib.msacademicverify.com-shibboleth-sp.xml
diff --git a/swamid-2.0/idp.ita.chalmers.se-idp-shibboleth.xml b/swamid-2.0/idp.ita.chalmers.se-idp-shibboleth.xml
deleted file mode 100644
index f007f514..00000000
--- a/swamid-2.0/idp.ita.chalmers.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     This is example metadata only. Do *NOT* supply it as is without review,
-     and do *NOT* provide it in real time to your partners.
-
-     This metadata is not dynamic - it will not change as your configuration changes.
--->
-<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://idp.ita.chalmers.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-03-14T14:07:26Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp.ita.chalmers.se/idp/shibboleth">
-    <Extensions>
-      <shibmd:Scope regexp="false">chalmers.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Chalmers Test Shib idp.ita.chalmers.se</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Chalmers Test Shib idp.ita.chalmers.se</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDODCCAiCgAwIBAgIVAPkAQaomf9uJjWVTO7x2EDC96nKIMA0GCSqGSIb3DQEB
-CwUAMB4xHDAaBgNVBAMME2lkcC5pdGEuY2hhbG1lcnMuc2UwHhcNMTYwMzE0MTIw
-NDM0WhcNMzYwMzE0MTIwNDM0WjAeMRwwGgYDVQQDDBNpZHAuaXRhLmNoYWxtZXJz
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApGrk88X1RzDlaatY
-Rp/VgKvlhBWm9HlkA4bDdGKy4gbdUf5jsCNZFhImRex7nc1zrmDG1W8GEeRJBPCf
-F6HiUsFBpK7Igu165aISaokvLKcy6BhLXqOn0MuH0WIEPGqB2N9/gSdVOVv1Vqpt
-DzYktT9QOsj9lNY2TMbCmrUXLhqL0UxswuyhX6itNLM391Dh4c8PuEzQbqAbZzaA
-VpbdYHqUeWcPjHQ0oktBPCJBoTVu5Htwrh4FYw+1fI6lLhY8Nt0InHs9cam/pnA1
-Y/MffiauzCVB9j8Ktxkw6hHrwlP8QDIDLufGa23JX0I2B0Sh0WpWnrcre/G7wT6/
-//TDEwIDAQABo20wazAdBgNVHQ4EFgQURO2PId773lD+ExlQLSd8RSEyeTUwSgYD
-VR0RBEMwQYITaWRwLml0YS5jaGFsbWVycy5zZYYqaHR0cHM6Ly9pZHAuaXRhLmNo
-YWxtZXJzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAh7X/B
-toNmp3rS51iRd/UO6NKKIo+i8cAsyUK0o5WvkALzpJLH96bvhHgWGbFC+jHz4nuw
-dGktov0fAvqsPIsMcE09y+FKR3wCYUPQaP5QoxdA+8wvqevCLUSjogPnDvzQlm+G
-DHBmzQuK7tagLDUv4tvwpj/F0RVGIdb7SdYaJqbn9SCbrlTjIX8HnQFmM8+Gubn0
-46+jFdmobZ00eZmq+bkf2LAlqn6THcLy7pMNT3rbrJ8abnivtaw4CxlMhvoZtutl
-tr4nOQ6itkF4ORwbYEp7HJIH98pPa8WmjhaB7RNiJvIa85ZJd7fivKFfOA5f0CTJ
-EFBlKk4TKip52h6h
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDODCCAiCgAwIBAgIVANJ+MSIFgQEBHbrHsmfc/izvVQcJMA0GCSqGSIb3DQEB
-CwUAMB4xHDAaBgNVBAMME2lkcC5pdGEuY2hhbG1lcnMuc2UwHhcNMTYwMzE0MTIw
-NDMzWhcNMzYwMzE0MTIwNDMzWjAeMRwwGgYDVQQDDBNpZHAuaXRhLmNoYWxtZXJz
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7jFedFxUtjnCIalw
-yfeMl4VTbbitE2gmbcfPg+e4daT9T19AdARB4IAlDId4dkEsL/lyBixNnUFEDHYb
-n/qIrvEbYd7DRCmS0w0Jgy57WQdgXkFmHx8JFre44fg2J4MUY5tvzacfMJDSS5Xt
-kKEQi4yrOdkPlBK0s5ayFLFkddhOQC6WZosLl1D0ltz40D6Mh304H3Fo1++JSoMr
-dLIFUD5dkXrUvUKUEM39C9WxL+3OZNKu8zOWEKae3yvRMo5ovufGK67ROzicN9hb
-SsknIDbyVTtbbgYRimX4YvBCLtYl1cP05cEh9MW0EVetowtdlyKni4Pwe1sNK8Z5
-KNGFdQIDAQABo20wazAdBgNVHQ4EFgQU0PeJjPmyfm74tmSf/6JChvReNSUwSgYD
-VR0RBEMwQYITaWRwLml0YS5jaGFsbWVycy5zZYYqaHR0cHM6Ly9pZHAuaXRhLmNo
-YWxtZXJzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBBG92B
-gbCaufVD40GfdekFg8J/hkV2TCZq0adq/P1h67iKZU2sIhtByxN9mGfIbzLZZCXW
-U6WSxq5eTiqMx0h9FS7xrDRRAHyQlMGgiMJEUjLR2Q9fKVyoJPXko2+8/pI/TsMl
-c+o/n9e4ygvyy6jmIAIi4Te5FLgd9XOVP5Q9oRL1iWdGEER+PZpFQuQPoXVN8xlN
-mYwey9jOwHJucS9xtWZAzxJEFI1iuPSv1GsFacN3TDCaQOZQLXceU4EpTKR6Uzcc
-09nTCHKD2TbVdF/G4SGtj5IAUsuAnMIB4z+t/nNkjFq1ERFnHkRD0lXPTFsM4ovB
-GUZeslIsn5fHDRS3
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDODCCAiCgAwIBAgIVAPGmL1+9NBSZBWj/J1/BcacKZZzkMA0GCSqGSIb3DQEB
-CwUAMB4xHDAaBgNVBAMME2lkcC5pdGEuY2hhbG1lcnMuc2UwHhcNMTYwMzE0MTIw
-NDMzWhcNMzYwMzE0MTIwNDMzWjAeMRwwGgYDVQQDDBNpZHAuaXRhLmNoYWxtZXJz
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr+ht0D0GBQOIN3In
-q/PpBAkp2rclrm3v40dW9RmuSJQZEvPbq6vr4vPGbHGVyaqzCPfIdVa/QWoC/PpW
-CAMkww2be4Y42VXkz92ULQSdis++zcSv0TIUTf1Zi9f0JuB0q/2/ru2f1uWobows
-Dn8z1O1KS+nT8EwN0cViV6wwdxX/pNUYu4k1GxzexXi8MGnNmw8SiCMUwCn6j+wQ
-/gE96Xe0NpQ3wPT8UFNy80cOHJfMSD1IFrITbkbwWzdbNTV5yeyY8xreqZqAls2+
-Vil1TU8n0Qg7RXHZtZBSYVw5y9MVh4qIFBYZArYUa6B/wa1ehpGk+pZ58p8vRgzw
-XUxvOQIDAQABo20wazAdBgNVHQ4EFgQUcTnkRdoHnCabINbdP/XhYqwv64gwSgYD
-VR0RBEMwQYITaWRwLml0YS5jaGFsbWVycy5zZYYqaHR0cHM6Ly9pZHAuaXRhLmNo
-YWxtZXJzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAHAHBP
-2x477yqU3zh96rYV7/LRSFjnTfvLprzeESvktBeUN9CJ5m9sL4NzcB7ptVaJydMU
-iNVfakYQQfKT03pv35i0UPDOOHJfkbDy7XNIrjYJ4pYGaQPuQ9rq1v51cPjbCBce
-Ae/Uc06B/m1nUCq4hTIQ/SIGqucAgnmYrGRFXUfBC2Je/9/T4dMo+FPBz+yes4E7
-Imm3AS6HPzsF6DtCnVCQh2Q53gyCx1xyu7v8q3DBsqFdMObD4deKrkuxrfMpJWCh
-OfQjEIL9kCcknd1VCNP9DNXlGPTIw7HPdpJlVSp98qSYagsUT49S2WAnjBJ6vWj+
-jvinjQZ2vsQirWYq
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ita.chalmers.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ita.chalmers.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <!--
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ita.chalmers.se/idp/profile/SAML2/Redirect/SLO"/>
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ita.chalmers.se/idp/profile/SAML2/POST/SLO"/>
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ita.chalmers.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-        -->
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ita.chalmers.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ita.chalmers.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ita.chalmers.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">chalmers.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDODCCAiCgAwIBAgIVAPkAQaomf9uJjWVTO7x2EDC96nKIMA0GCSqGSIb3DQEB
-CwUAMB4xHDAaBgNVBAMME2lkcC5pdGEuY2hhbG1lcnMuc2UwHhcNMTYwMzE0MTIw
-NDM0WhcNMzYwMzE0MTIwNDM0WjAeMRwwGgYDVQQDDBNpZHAuaXRhLmNoYWxtZXJz
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApGrk88X1RzDlaatY
-Rp/VgKvlhBWm9HlkA4bDdGKy4gbdUf5jsCNZFhImRex7nc1zrmDG1W8GEeRJBPCf
-F6HiUsFBpK7Igu165aISaokvLKcy6BhLXqOn0MuH0WIEPGqB2N9/gSdVOVv1Vqpt
-DzYktT9QOsj9lNY2TMbCmrUXLhqL0UxswuyhX6itNLM391Dh4c8PuEzQbqAbZzaA
-VpbdYHqUeWcPjHQ0oktBPCJBoTVu5Htwrh4FYw+1fI6lLhY8Nt0InHs9cam/pnA1
-Y/MffiauzCVB9j8Ktxkw6hHrwlP8QDIDLufGa23JX0I2B0Sh0WpWnrcre/G7wT6/
-//TDEwIDAQABo20wazAdBgNVHQ4EFgQURO2PId773lD+ExlQLSd8RSEyeTUwSgYD
-VR0RBEMwQYITaWRwLml0YS5jaGFsbWVycy5zZYYqaHR0cHM6Ly9pZHAuaXRhLmNo
-YWxtZXJzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAh7X/B
-toNmp3rS51iRd/UO6NKKIo+i8cAsyUK0o5WvkALzpJLH96bvhHgWGbFC+jHz4nuw
-dGktov0fAvqsPIsMcE09y+FKR3wCYUPQaP5QoxdA+8wvqevCLUSjogPnDvzQlm+G
-DHBmzQuK7tagLDUv4tvwpj/F0RVGIdb7SdYaJqbn9SCbrlTjIX8HnQFmM8+Gubn0
-46+jFdmobZ00eZmq+bkf2LAlqn6THcLy7pMNT3rbrJ8abnivtaw4CxlMhvoZtutl
-tr4nOQ6itkF4ORwbYEp7HJIH98pPa8WmjhaB7RNiJvIa85ZJd7fivKFfOA5f0CTJ
-EFBlKk4TKip52h6h
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDODCCAiCgAwIBAgIVANJ+MSIFgQEBHbrHsmfc/izvVQcJMA0GCSqGSIb3DQEB
-CwUAMB4xHDAaBgNVBAMME2lkcC5pdGEuY2hhbG1lcnMuc2UwHhcNMTYwMzE0MTIw
-NDMzWhcNMzYwMzE0MTIwNDMzWjAeMRwwGgYDVQQDDBNpZHAuaXRhLmNoYWxtZXJz
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7jFedFxUtjnCIalw
-yfeMl4VTbbitE2gmbcfPg+e4daT9T19AdARB4IAlDId4dkEsL/lyBixNnUFEDHYb
-n/qIrvEbYd7DRCmS0w0Jgy57WQdgXkFmHx8JFre44fg2J4MUY5tvzacfMJDSS5Xt
-kKEQi4yrOdkPlBK0s5ayFLFkddhOQC6WZosLl1D0ltz40D6Mh304H3Fo1++JSoMr
-dLIFUD5dkXrUvUKUEM39C9WxL+3OZNKu8zOWEKae3yvRMo5ovufGK67ROzicN9hb
-SsknIDbyVTtbbgYRimX4YvBCLtYl1cP05cEh9MW0EVetowtdlyKni4Pwe1sNK8Z5
-KNGFdQIDAQABo20wazAdBgNVHQ4EFgQU0PeJjPmyfm74tmSf/6JChvReNSUwSgYD
-VR0RBEMwQYITaWRwLml0YS5jaGFsbWVycy5zZYYqaHR0cHM6Ly9pZHAuaXRhLmNo
-YWxtZXJzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBBG92B
-gbCaufVD40GfdekFg8J/hkV2TCZq0adq/P1h67iKZU2sIhtByxN9mGfIbzLZZCXW
-U6WSxq5eTiqMx0h9FS7xrDRRAHyQlMGgiMJEUjLR2Q9fKVyoJPXko2+8/pI/TsMl
-c+o/n9e4ygvyy6jmIAIi4Te5FLgd9XOVP5Q9oRL1iWdGEER+PZpFQuQPoXVN8xlN
-mYwey9jOwHJucS9xtWZAzxJEFI1iuPSv1GsFacN3TDCaQOZQLXceU4EpTKR6Uzcc
-09nTCHKD2TbVdF/G4SGtj5IAUsuAnMIB4z+t/nNkjFq1ERFnHkRD0lXPTFsM4ovB
-GUZeslIsn5fHDRS3
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDODCCAiCgAwIBAgIVAPGmL1+9NBSZBWj/J1/BcacKZZzkMA0GCSqGSIb3DQEB
-CwUAMB4xHDAaBgNVBAMME2lkcC5pdGEuY2hhbG1lcnMuc2UwHhcNMTYwMzE0MTIw
-NDMzWhcNMzYwMzE0MTIwNDMzWjAeMRwwGgYDVQQDDBNpZHAuaXRhLmNoYWxtZXJz
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr+ht0D0GBQOIN3In
-q/PpBAkp2rclrm3v40dW9RmuSJQZEvPbq6vr4vPGbHGVyaqzCPfIdVa/QWoC/PpW
-CAMkww2be4Y42VXkz92ULQSdis++zcSv0TIUTf1Zi9f0JuB0q/2/ru2f1uWobows
-Dn8z1O1KS+nT8EwN0cViV6wwdxX/pNUYu4k1GxzexXi8MGnNmw8SiCMUwCn6j+wQ
-/gE96Xe0NpQ3wPT8UFNy80cOHJfMSD1IFrITbkbwWzdbNTV5yeyY8xreqZqAls2+
-Vil1TU8n0Qg7RXHZtZBSYVw5y9MVh4qIFBYZArYUa6B/wa1ehpGk+pZ58p8vRgzw
-XUxvOQIDAQABo20wazAdBgNVHQ4EFgQUcTnkRdoHnCabINbdP/XhYqwv64gwSgYD
-VR0RBEMwQYITaWRwLml0YS5jaGFsbWVycy5zZYYqaHR0cHM6Ly9pZHAuaXRhLmNo
-YWxtZXJzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAHAHBP
-2x477yqU3zh96rYV7/LRSFjnTfvLprzeESvktBeUN9CJ5m9sL4NzcB7ptVaJydMU
-iNVfakYQQfKT03pv35i0UPDOOHJfkbDy7XNIrjYJ4pYGaQPuQ9rq1v51cPjbCBce
-Ae/Uc06B/m1nUCq4hTIQ/SIGqucAgnmYrGRFXUfBC2Je/9/T4dMo+FPBz+yes4E7
-Imm3AS6HPzsF6DtCnVCQh2Q53gyCx1xyu7v8q3DBsqFdMObD4deKrkuxrfMpJWCh
-OfQjEIL9kCcknd1VCNP9DNXlGPTIw7HPdpJlVSp98qSYagsUT49S2WAnjBJ6vWj+
-jvinjQZ2vsQirWYq
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ita.chalmers.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ita.chalmers.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> -->
-    <!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
-  </AttributeAuthorityDescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/pingpong.chalmers.se-shibboleth.xml b/swamid-2.0/pingpong.chalmers.se-shibboleth.xml
deleted file mode 100644
index bab4bad6..00000000
--- a/swamid-2.0/pingpong.chalmers.se-shibboleth.xml
+++ /dev/null
@@ -1,41 +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://pingpong.chalmers.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-06-12T08:15:13Z">
-      <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:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDAzCCAeugAwIBAgIJAMLwpt/5/eu6MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-BAMTFHBpbmdwb25nLmNoYWxtZXJzLnNlMB4XDTEyMDQyMzE1Mzg1NloXDTIyMDQy
-MTE1Mzg1NlowHzEdMBsGA1UEAxMUcGluZ3BvbmcuY2hhbG1lcnMuc2UwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEv+Gw3RQeoVOamW80/g7vVEpgDIqy
-/pCrndJOnrSSxjBFwO3KfCnkioGjvzV/N+jt2AdtGucwY107CNp541hEjm9xMLeC
-8hR+khu1HWl1/IAht8EgMx0HnAFYJlVUjFcgYibjaaBIRQfGlfQorlWdBHnDXn0O
-KPRlyXv5p+lmJIl5vDCBkbzd4wapa3eyT6tBiDrH3sSunU/DTiEcJOwp3BOgY1zy
-Zu/JuVQfG9l4/s7qjWp5c5IEXBSvQ1+Ho/kMB/mVHbU/PZaZTOjMXKUvNdYhpgST
-CNXCaWnasUq1UrAo0FD0Kbr6Ams19l+7p1bIzFKdqFc9SYt0pc5RGSFxAgMBAAGj
-QjBAMB8GA1UdEQQYMBaCFHBpbmdwb25nLmNoYWxtZXJzLnNlMB0GA1UdDgQWBBTX
-mSIhbeoUjlYpHmRjlF2+78PIRzANBgkqhkiG9w0BAQUFAAOCAQEAbOH4yUozvbEB
-UtOkIWC6qaoUKPf9VHIQveDqZdULpW3m2Q4vSzMKb/yo/tBLERUTgZ0NXYuT6iLv
-Zdgs0Cld6kS9UvZURqe8fKjfkJOnu4RI7VJASWfJsypoguih0fzIXiLxcbvXmJhV
-qiRt8BRZJjaWYvtzk711YfJFqV4vOpcU1+IpBX6gbyjzHY5adNVk3t568qPJxKU/
-KOUNSC34z9qxk4SIPE498SFpAYlJo5HnIN3aTa2WnzFUlcQFmFbuHTRDQ/v3X7dL
-eN939szhtbDgjf2BL5D0KmkrRPVsCVbqAcvWZ6j5u7tznMUK7l3IuWaTaRIdumnC
-0BPmIT4uxg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pingpong.chalmers.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pingpong.chalmers.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pingpong.chalmers.se/Shibboleth.sso/SLO/POST"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pingpong.chalmers.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pingpong.chalmers.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pingpong.chalmers.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/test-chalmers.pingpong.net-shibboleth.xml b/swamid-2.0/test-chalmers.pingpong.net-shibboleth.xml
deleted file mode 100644
index 48c60882..00000000
--- a/swamid-2.0/test-chalmers.pingpong.net-shibboleth.xml
+++ /dev/null
@@ -1,50 +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://test-chalmers.pingpong.net/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-06-12T08:15:13Z">
-      <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>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test-chalmers.pingpong.net/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>https://test-chalmers.pingpong.net/shibboleth</ds:KeyName>
-        <ds:KeyName>test-chalmers.pingpong.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=test-chalmers.pingpong.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDRDCCAiygAwIBAgIJAP6ZemmXL5FeMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
-BAMTGnRlc3QtY2hhbG1lcnMucGluZ3BvbmcubmV0MB4XDTEyMDQyMzE1MjAzNloX
-DTIyMDQyMTE1MjAzNlowJTEjMCEGA1UEAxMadGVzdC1jaGFsbWVycy5waW5ncG9u
-Zy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeUfBKZmcOuwO2
-soSJ815+WSEp7opJfNPST4+EnflE2PpmhjsntR6ykCBzQ7QpNhiVsAw7oW7C5sCh
-3SZDCebkj0Hkw8WY6HiD+QEPBDHhDDpjVlMbOImCHCnSVaREaOsz8X6uPCWuSx7w
-j/cq78TTy+2pegV+S/Oey5yluJ4Tkd8poIKqcqP1TBKHgxVuQZZDsYfvkpavmjSN
-WRD0i8tcepEENT4/g+RuaO4W+Qse9/3r4e9Yq4TAsF77m6RK7+SDagdB9bzmfiAQ
-554ouVKCla4FomxAcEoHSL72u2VuRW4G8U7/4msim76diLzVV92M0udaEEmosH/G
-aWtaYCXbAgMBAAGjdzB1MFQGA1UdEQRNMEuCGnRlc3QtY2hhbG1lcnMucGluZ3Bv
-bmcubmV0hi1odHRwczovL3Rlc3QtY2hhbG1lcnMucGluZ3BvbmcubmV0L3NoaWJi
-b2xldGgwHQYDVR0OBBYEFDSmFzpD8s4QqK7obP7qJ9YeSHN0MA0GCSqGSIb3DQEB
-BQUAA4IBAQBlsyHLGj5gfcV9diP5aclSaGys3C1EYLjQzlh3CDgfO57HuZRwlvdq
-8Fl67ffuvqxhwPDUsC2U49Xfr3bf7VkqB8gv8Ej+A/FR5EZ2mpQDmuccRnmT2pPH
-LADedmGnSBjPfB7CTix3VU/eviCDAOBE5e9aayFLQNXW7DWhFaMDn0LW+uN/D7BN
-0/fR00qpwH3ntPVIdY5S5cg4V2B6v6jQHofHfZ2ZxsYec/N9N+yHGHpbGeKLZHdX
-YjXxS/djEY28+6jqPOf3munRNmjqpaSM+Xt6mgjsj5Z1SfTUj3MOENOUzryL3YMq
-wBZX3YLUYwrrZPmGsN/M9X4aD62J66nQ
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test-chalmers.pingpong.net/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-chalmers.pingpong.net/Shibboleth.sso/SLO/Artifact"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-chalmers.pingpong.net/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test-chalmers.pingpong.net/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test-chalmers.pingpong.net/Shibboleth.sso/SLO/SOAP"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-chalmers.pingpong.net/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test-chalmers.pingpong.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-chalmers.pingpong.net/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test-chalmers.pingpong.net/Shibboleth.sso/SAML2/ECP" index="3"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 74d48457..6506d527 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -113,7 +113,6 @@
   <xi:include href="swamid-2.0/nagios.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml"/>
   <xi:include href="swamid-2.0/its-pd0062.ad.umu.se-shibboleth-sp.xml"/>
-  <xi:include href="swamid-2.0/pingpong.chalmers.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/cambro-test-26.umdc.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml"/>
   <xi:include href="swamid-2.0/play.hig.se.xml"/>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 138be279..088cabed 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -23,7 +23,6 @@
   <xi:include href="swamid-2.0/miunidptest.miun.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.uhr.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp02.gih.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/idp.ita.chalmers.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/shib-test01.skolfederation.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/shib-test02.skolfederation.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp2.it.gu.se-idp-shibboleth.xml"/>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index 0f954a02..ffc398c0 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -8,7 +8,6 @@
   <xi:include href="swamid-2.0/www-en.nyautb.its.umu.se-aws-sp-en.xml"/>
   <xi:include href="swamid-2.0/expert.nyautb.its.umu.se-ecs-sp.xml"/>
   <xi:include href="swamid-2.0/www.nyautb.its.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/test-chalmers.pingpong.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/minasidor.ladok.umu.se-shib-sp.xml"/>
   <xi:include href="swamid-2.0/bhb-00.its.umu.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/imogen.surfnet.nl-proxy-module.php-saml-sp-metadata.php-default-sp.xml"/>