From 07b8531f4ba26ba4a1cce042ab5ea15b4406a35a Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Wed, 5 Oct 2016 17:33:27 +0200
Subject: Resolves SWAMIDOPS-8357

---
 swamid-2.0/nacho.adm.gu.se-shibboleth.xml | 73 -------------------------------
 swamid-sp-2.0.mxml                        |  1 -
 2 files changed, 74 deletions(-)
 delete mode 100644 swamid-2.0/nacho.adm.gu.se-shibboleth.xml

diff --git a/swamid-2.0/nacho.adm.gu.se-shibboleth.xml b/swamid-2.0/nacho.adm.gu.se-shibboleth.xml
deleted file mode 100644
index 62f3f0ce..00000000
--- a/swamid-2.0/nacho.adm.gu.se-shibboleth.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nacho.adm.gu.se/shibboleth">
-  <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://nacho.adm.gu.se/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>nacho-pc</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nacho-pc</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC3zCCAcegAwIBAgIJANjsPUfkRN00MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-BAMTCG5hY2hvLXBjMB4XDTEwMDQxMzEzMzI1OVoXDTIwMDQxMDEzMzI1OVowEzER
-MA8GA1UEAxMIbmFjaG8tcGMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQC99pEipkOSaRwbIYY/dfFIR2/COahYi+fU3qDpCmG6JbZzO3O9ybjF/sUmt1fA
-Unq+1HinEwSGDfizUoN+/NUcAG4N8juD+UL9bbYEcfx7Ly7jlGiZa3Fr3zFqxXGQ
-w+vAtnk4tKtt0kNKPXNs9oApEzGpUAj12EQBRMiKLhFPqNMo8YQ+OUqCyZMYm2Oc
-uJFj9QBN3vLCRFJJZCt7kmpfnC9M4KdMFvhzbDMixrk4qdjuUB0W7bRAiHk0Yupw
-QUZMk0kF4AJrWFliUIsNVIm3q4I0AOlAgbii5rsarDjGaRlE421K6TZxwx+0UfnQ
-G3pn+xmBV7purr0y6VmQOaZvAgMBAAGjNjA0MBMGA1UdEQQMMAqCCG5hY2hvLXBj
-MB0GA1UdDgQWBBQAzw+GSXwuDMhAaUP+M9D28G8yNDANBgkqhkiG9w0BAQUFAAOC
-AQEAKmp+HbJKFXb+NEPdktE8Y+PKV9YWsPpBKCxSHxDkgFSXLnCjxr6RpPYPvgqY
-oHjkqzea//qZ4oqVRjOBauGqZ1u+PBYEwsZGSL6v2/AMjM51D1VOvMJz3Rt63ee1
-+oIZbU7teIK3n5BpSjHhScglXf2psZEEmQ5FGTLMUvq1Ri5bMJjmVNNyQH0Cm1WM
-IGGsITC3/oso3+KzpqcWISIqCeBFfYZ4mh/PIOoZEpYSN9jkMBHtlcc9mcR6aQX3
-0KtgoDtLnJA0Xw9ubL3YhxZLOdWTswHGr4AoplV09zQkNG87GIfVDAtzmZHLlP6S
-s0eg2zS0HU2kmUbaL6tbYB5jyw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>nacho-pc</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nacho-pc</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC3zCCAcegAwIBAgIJANjsPUfkRN00MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-BAMTCG5hY2hvLXBjMB4XDTEwMDQxMzEzMzI1OVoXDTIwMDQxMDEzMzI1OVowEzER
-MA8GA1UEAxMIbmFjaG8tcGMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQC99pEipkOSaRwbIYY/dfFIR2/COahYi+fU3qDpCmG6JbZzO3O9ybjF/sUmt1fA
-Unq+1HinEwSGDfizUoN+/NUcAG4N8juD+UL9bbYEcfx7Ly7jlGiZa3Fr3zFqxXGQ
-w+vAtnk4tKtt0kNKPXNs9oApEzGpUAj12EQBRMiKLhFPqNMo8YQ+OUqCyZMYm2Oc
-uJFj9QBN3vLCRFJJZCt7kmpfnC9M4KdMFvhzbDMixrk4qdjuUB0W7bRAiHk0Yupw
-QUZMk0kF4AJrWFliUIsNVIm3q4I0AOlAgbii5rsarDjGaRlE421K6TZxwx+0UfnQ
-G3pn+xmBV7purr0y6VmQOaZvAgMBAAGjNjA0MBMGA1UdEQQMMAqCCG5hY2hvLXBj
-MB0GA1UdDgQWBBQAzw+GSXwuDMhAaUP+M9D28G8yNDANBgkqhkiG9w0BAQUFAAOC
-AQEAKmp+HbJKFXb+NEPdktE8Y+PKV9YWsPpBKCxSHxDkgFSXLnCjxr6RpPYPvgqY
-oHjkqzea//qZ4oqVRjOBauGqZ1u+PBYEwsZGSL6v2/AMjM51D1VOvMJz3Rt63ee1
-+oIZbU7teIK3n5BpSjHhScglXf2psZEEmQ5FGTLMUvq1Ri5bMJjmVNNyQH0Cm1WM
-IGGsITC3/oso3+KzpqcWISIqCeBFfYZ4mh/PIOoZEpYSN9jkMBHtlcc9mcR6aQX3
-0KtgoDtLnJA0Xw9ubL3YhxZLOdWTswHGr4AoplV09zQkNG87GIfVDAtzmZHLlP6S
-s0eg2zS0HU2kmUbaL6tbYB5jyw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nacho.adm.gu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nacho.adm.gu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nacho.adm.gu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nacho.adm.gu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nacho.adm.gu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nacho.adm.gu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nacho.adm.gu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nacho.adm.gu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nacho.adm.gu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nacho.adm.gu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nacho.adm.gu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nacho.adm.gu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nacho.adm.gu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nacho.adm.gu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nacho.adm.gu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index f3a659ac..45922df5 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -77,7 +77,6 @@
   <xi:include href="swamid-2.0/account-test.unit.liu.se-shibboleth-sp.xml"/>
   <xi:include href="swamid-2.0/registrera.hb.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/aktivering.db.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/nacho.adm.gu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/nyainloggning.slu.se-shibboleth-sp.xml"/>
   <xi:include href="swamid-2.0/webapp-utv.ita.mdh.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/portal.mdh.se-shibboleth.xml"/>
-- 
cgit v1.2.3