SWAMID-239, Plocka bort sp's som inte ska användas längre

4 files changed, 0 insertions, 185 deletions

diff --git a/sp-with-simplesign b/sp-with-simplesign
index cdd6722d..0a2aed52 100644
--- a/sp-with-simplesign
+++ b/sp-with-simplesign
@@ -129,7 +129,6 @@ testshib.msacademicverify.com-shibboleth-sp.xml
 tta-portal.misc.kth.se-shibboleth.xml
 umdac-stdout.umdc.umu.se-shibboleth.xml
 umdac-strike.ad.umu.se-shibboleth.xml
-umdac-utv1.ad.umu.se-shibboleth.xml
 umdac-utv2.ad.umu.se-shibboleth.xml
 unitcf.se-shibboleth.xml
 uraccess.se-shibboleth-sp.xml
@@ -151,7 +150,6 @@ www.antagning.nyautb.its.umu.se-ecs-sp.xml
 www.antagning.se-aws-sp.xml
 www.diva-portal.org-shibboleth.xml
 www.nyautb.its.umu.se-aws-sp.xml
-www.servicedesk.its.umu.se-shibboleth.xml
 www.servicedesk.umdac.umu.se-shibboleth.xml
 www.studera.nyautb.its.umu.se-aws-sp.xml
 www.universityadmissions.se-aws-sp-en.xml
diff --git a/swamid-2.0/umdac-utv1.ad.umu.se-shibboleth.xml b/swamid-2.0/umdac-utv1.ad.umu.se-shibboleth.xml
deleted file mode 100644
index 19ded56a..00000000
--- a/swamid-2.0/umdac-utv1.ad.umu.se-shibboleth.xml
+++ /dev/null
@@ -1,78 +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://umdac-utv1.ad.umu.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/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</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>
-      <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://umdac-utv1.ad.umu.se/Shibboleth.sso/DS/ds.swamid.se"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://umdac-utv1.ad.umu.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">QA-miljö för ServiceDesk</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">QA-environment for ServiceDesk</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">En samling av verktyg och tjänster för studenter och anställda vid Umeå universitet
-    </mdui:Description>
-        <mdui:Description xml:lang="en">A collection of tools and services for students and staff at Umeå University
-    </mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>Tommy Larsson</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=tommy.larsson@adm.umu.se,CN=Tommy Larsson,OU=ITS,O=ITS,L=Umea,ST=Vasterbotten,C=SE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEnjCCA4agAwIBAgIJAJEv/JM5LIg2MA0GCSqGSIb3DQEBBQUAMIGQMQswCQYD
-VQQGEwJTRTEVMBMGA1UECBMMVmFzdGVyYm90dGVuMQ0wCwYDVQQHEwRVbWVhMQww
-CgYDVQQKEwNJVFMxDDAKBgNVBAsTA0lUUzEWMBQGA1UEAxMNVG9tbXkgTGFyc3Nv
-bjEnMCUGCSqGSIb3DQEJARYYdG9tbXkubGFyc3NvbkBhZG0udW11LnNlMB4XDTEx
-MDEyNzA4NDcyOVoXDTEzMTIxMDA4NDcyOVowgZAxCzAJBgNVBAYTAlNFMRUwEwYD
-VQQIEwxWYXN0ZXJib3R0ZW4xDTALBgNVBAcTBFVtZWExDDAKBgNVBAoTA0lUUzEM
-MAoGA1UECxMDSVRTMRYwFAYDVQQDEw1Ub21teSBMYXJzc29uMScwJQYJKoZIhvcN
-AQkBFhh0b21teS5sYXJzc29uQGFkbS51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDsxGkZlSQiqzNG33NY9U+7skx7LQSXB/6tjjbkM/VjDqfa
-KNd1uWJuP6NWgoOD3vAlCljL3EuBWMKysyDiJBi8BS02/YT2IBRuXxQ7VK5tvE3/
-GwKH2j/nTPTlpevfcQuv+5Rpwde6fpMsm/rZmoaEWdBhLSuvzY4HJHRa+qGJlJoh
-ylaQsQjj8smh+6+pNgYNQH/g3FSuf7/xwSmpIdjy84HYtuV8Bi+bx6OU0/NC3oyH
-YaxZj0TTk96929pSO5jIgwQQ91Jws8rh5wxHy7ZAQrxSni8sxst6euqH0LCmFI6b
-jjxBclg6VvB1zCNsMRHakiUNJwNMDdpeWuhAcEVVAgMBAAGjgfgwgfUwHQYDVR0O
-BBYEFEBdLsnYxFEP+hBIqHEyx/8IDMIJMIHFBgNVHSMEgb0wgbqAFEBdLsnYxFEP
-+hBIqHEyx/8IDMIJoYGWpIGTMIGQMQswCQYDVQQGEwJTRTEVMBMGA1UECBMMVmFz
-dGVyYm90dGVuMQ0wCwYDVQQHEwRVbWVhMQwwCgYDVQQKEwNJVFMxDDAKBgNVBAsT
-A0lUUzEWMBQGA1UEAxMNVG9tbXkgTGFyc3NvbjEnMCUGCSqGSIb3DQEJARYYdG9t
-bXkubGFyc3NvbkBhZG0udW11LnNlggkAkS/8kzksiDYwDAYDVR0TBAUwAwEB/zAN
-BgkqhkiG9w0BAQUFAAOCAQEAV7YyyId9u6p0X6EVdYYgJRw3YgPeT/7KQAXrM5Fd
-+0ZloD6py7JKk6MjKSJKPh7dcfxubJZWpPpv4tvLlxVh5d8h1ke8B9Pll/SOkF7m
-T6an+GTWbWfB3C5w2LbiuwdHvydvJgM61f8437rF9s22MYeSStuhsnzT8KlUg6OV
-rzavOVnYMhei94uDmHesTRdB1GlO7Gut34C8V9L9CysEj6ezjPaeUTw/1+oP81SS
-wlEG2Ix+o0k2AGIkAww8dfmdCG6TSWJ7ovpvHeNgC9BoGrANqmLDG/tFlx6CZxtp
-NwnL2DNdxAIqK+BGt+Q0XVGJGEfnh/8XuYwTn2MNoJcxSQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://umdac-utv1.ad.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://umdac-utv1.ad.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://umdac-utv1.ad.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://umdac-utv1.ad.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://umdac-utv1.ad.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://umdac-utv1.ad.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://umdac-utv1.ad.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://umdac-utv1.ad.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://umdac-utv1.ad.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://umdac-utv1.ad.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://umdac-utv1.ad.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://umdac-utv1.ad.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://umdac-utv1.ad.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://umdac-utv1.ad.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://umdac-utv1.ad.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.servicedesk.its.umu.se-shibboleth.xml b/swamid-2.0/www.servicedesk.its.umu.se-shibboleth.xml
deleted file mode 100644
index fc95a773..00000000
--- a/swamid-2.0/www.servicedesk.its.umu.se-shibboleth.xml
+++ /dev/null
@@ -1,103 +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://www.servicedesk.its.umu.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/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</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://www.servicedesk.its.umu.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">ServiceDesk - IT-support vid Umeå universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">ServiceDesk - IT-support at Umea University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">En samling av verktyg och tjänster för studenter och anställda vid Umeå universitet</mdui:Description>
-        <mdui:Description xml:lang="en">A collection of tools and services for students and staff at Umeå University</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>www.servicedesk.its.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=tommy.larsson@adm.umu.se,CN=www.servicedesk.its.umu.se,OU=ITS,O=ITS,L=Umea,ST=Vasterbotten,C=SE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEDzCCAvegAwIBAgIJAK1n6INIIuwWMA0GCSqGSIb3DQEBBQUAMIGdMQswCQYD
-VQQGEwJTRTEVMBMGA1UECAwMVmFzdGVyYm90dGVuMQ0wCwYDVQQHDARVbWVhMQww
-CgYDVQQKDANJVFMxDDAKBgNVBAsMA0lUUzEjMCEGA1UEAwwad3d3LnNlcnZpY2Vk
-ZXNrLml0cy51bXUuc2UxJzAlBgkqhkiG9w0BCQEWGHRvbW15LmxhcnNzb25AYWRt
-LnVtdS5zZTAeFw0xMTA1MTYwNjM4NTBaFw0xNDAzMjkwNjM4NTBaMIGdMQswCQYD
-VQQGEwJTRTEVMBMGA1UECAwMVmFzdGVyYm90dGVuMQ0wCwYDVQQHDARVbWVhMQww
-CgYDVQQKDANJVFMxDDAKBgNVBAsMA0lUUzEjMCEGA1UEAwwad3d3LnNlcnZpY2Vk
-ZXNrLml0cy51bXUuc2UxJzAlBgkqhkiG9w0BCQEWGHRvbW15LmxhcnNzb25AYWRt
-LnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANJEvTU6sPUf
-+QdTlHhSzEHHBraAqXnmBAtCH4PrpYZt5UBMnrDCfWMWI6rDQ0m5t/foWGMG/Eat
-EycsYbySEyDgiK7AK9ahC0Bpd6CyT1gYGOfBIdMDNOgCahr2GnnvNp78/sUaC7pU
-qDXOdMsB4iPiLtEYCa6XTJi/KVB487utrIMud4UpGojtXORSFHpPC45QHgZicj8R
-0jIL7VPCTgJBKWwqeMoOUtDl5iFgMXTkafXVKR+rrh8UFS4LmNNid0PbxofI/azG
-vc7CF0E59O184V6UnLHJwcLqaJkVzIdq1z5dUKxskPnm6xX1xZNC+DVW7ALEEfD8
-MZeVe3PJn9cCAwEAAaNQME4wHQYDVR0OBBYEFO3UOhgEKHKE36Id4OB/zbb73ZmK
-MB8GA1UdIwQYMBaAFO3UOhgEKHKE36Id4OB/zbb73ZmKMAwGA1UdEwQFMAMBAf8w
-DQYJKoZIhvcNAQEFBQADggEBABQZkJyN0sgb+pGxw+sSeYSLhZxdLOySKZSr7LV4
-GinxtO41dwXNmGFPavO4sYExqo2FWUo2RItwUorOHCtlpypfWf+xBThD2uRR44+a
-tb0wNbW7y/hGwCCe1as2lewrvPOzWVG51I4Xxw5hiNpz+7ayNRX+icYgONP1ZSN+
-jrymeKjpHE9w443OiAkezSm2tXADbEugC+DhowF9PXnX2Gn8BfXrD1LPP1ze200S
-4tHrNMcpgz8mndg+eAvBnGxe/OdC+DuDO/33E559DYGi7Iw5GzGbCPLCuUsWvstm
-Ak0+kMSVOzv6UoGDUEbEh2o5K1iQnOzUKyTJrfW1if1I8Wg=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>www.servicedesk.its.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=tommy.larsson@adm.umu.se,CN=www.servicedesk.its.umu.se,OU=ITS,O=ITS,L=Umea,ST=Vasterbotten,C=SE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEDzCCAvegAwIBAgIJAK1n6INIIuwWMA0GCSqGSIb3DQEBBQUAMIGdMQswCQYD
-VQQGEwJTRTEVMBMGA1UECAwMVmFzdGVyYm90dGVuMQ0wCwYDVQQHDARVbWVhMQww
-CgYDVQQKDANJVFMxDDAKBgNVBAsMA0lUUzEjMCEGA1UEAwwad3d3LnNlcnZpY2Vk
-ZXNrLml0cy51bXUuc2UxJzAlBgkqhkiG9w0BCQEWGHRvbW15LmxhcnNzb25AYWRt
-LnVtdS5zZTAeFw0xMTA1MTYwNjM4NTBaFw0xNDAzMjkwNjM4NTBaMIGdMQswCQYD
-VQQGEwJTRTEVMBMGA1UECAwMVmFzdGVyYm90dGVuMQ0wCwYDVQQHDARVbWVhMQww
-CgYDVQQKDANJVFMxDDAKBgNVBAsMA0lUUzEjMCEGA1UEAwwad3d3LnNlcnZpY2Vk
-ZXNrLml0cy51bXUuc2UxJzAlBgkqhkiG9w0BCQEWGHRvbW15LmxhcnNzb25AYWRt
-LnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANJEvTU6sPUf
-+QdTlHhSzEHHBraAqXnmBAtCH4PrpYZt5UBMnrDCfWMWI6rDQ0m5t/foWGMG/Eat
-EycsYbySEyDgiK7AK9ahC0Bpd6CyT1gYGOfBIdMDNOgCahr2GnnvNp78/sUaC7pU
-qDXOdMsB4iPiLtEYCa6XTJi/KVB487utrIMud4UpGojtXORSFHpPC45QHgZicj8R
-0jIL7VPCTgJBKWwqeMoOUtDl5iFgMXTkafXVKR+rrh8UFS4LmNNid0PbxofI/azG
-vc7CF0E59O184V6UnLHJwcLqaJkVzIdq1z5dUKxskPnm6xX1xZNC+DVW7ALEEfD8
-MZeVe3PJn9cCAwEAAaNQME4wHQYDVR0OBBYEFO3UOhgEKHKE36Id4OB/zbb73ZmK
-MB8GA1UdIwQYMBaAFO3UOhgEKHKE36Id4OB/zbb73ZmKMAwGA1UdEwQFMAMBAf8w
-DQYJKoZIhvcNAQEFBQADggEBABQZkJyN0sgb+pGxw+sSeYSLhZxdLOySKZSr7LV4
-GinxtO41dwXNmGFPavO4sYExqo2FWUo2RItwUorOHCtlpypfWf+xBThD2uRR44+a
-tb0wNbW7y/hGwCCe1as2lewrvPOzWVG51I4Xxw5hiNpz+7ayNRX+icYgONP1ZSN+
-jrymeKjpHE9w443OiAkezSm2tXADbEugC+DhowF9PXnX2Gn8BfXrD1LPP1ze200S
-4tHrNMcpgz8mndg+eAvBnGxe/OdC+DuDO/33E559DYGi7Iw5GzGbCPLCuUsWvstm
-Ak0+kMSVOzv6UoGDUEbEh2o5K1iQnOzUKyTJrfW1if1I8Wg=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.servicedesk.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.servicedesk.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.servicedesk.its.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.servicedesk.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.servicedesk.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.servicedesk.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.servicedesk.its.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.servicedesk.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.servicedesk.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.servicedesk.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.servicedesk.its.umu.se/Shibboleth.sso/SAML/POST" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.servicedesk.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.servicedesk.its.umu.se/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.servicedesk.its.umu.se/Shibboleth.sso/SAML2/POST" index="10"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.servicedesk.its.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index ab11d373..c310bd9a 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -45,7 +45,6 @@
   <xi:include href="swamid-2.0/webapp-utv.ita.mdh.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/portal.mdh.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sp.it.gu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/umdac-utv1.ad.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/umdac-strike.ad.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/aktivera-test.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/aktivera.su.se-shibboleth.sso.xml"/>
@@ -102,7 +101,6 @@
   <xi:include href="swamid-2.0/crowdtest.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/ni.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/epc.ub.uu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/www.servicedesk.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.wisum.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/mailfilter.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/mds.sunet.se-shibboleth.xml"/>