SWAMID-1186: login1.fhs.se is no longer in use

2 files changed, 0 insertions, 99 deletions

diff --git a/swamid-2.0/login1.fhs.se-adfs-services-trust.xml b/swamid-2.0/login1.fhs.se-adfs-services-trust.xml
deleted file mode 100644
index 68dc2c7a..00000000
--- a/swamid-2.0/login1.fhs.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,98 +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="http://login1.fhs.se/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-04-16T11:40:36Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <attr:EntityAttributes xmlns:attr="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://refeds.org/category/hide-from-discovery</samla:AttributeValue>
-      </samla:Attribute>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
-      </saml: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-support">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </attr:EntityAttributes>
-  </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" 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=http://login1.fhs.se/adfs/services/trust">
-    <Extensions>
-      <shibmd:Scope regexp="false">fhs.se</shibmd:Scope>
-      <shibmd:Scope regexp="false">student.fhs.se</shibmd:Scope>
-      <shibmd:Scope regexp="false">op.fhs.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Försvarshögskolan - OLD</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Swedish Defence University - OLD</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Försvarshögskolan - OLD</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Swedish Defence University - OLD</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.fhs.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.fhs.se/en/</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="671" width="2494">https://login1.fhs.se/adfs/portal/logo/logo.jpg</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="671" width="2494">https://login1.fhs.se/adfs/portal/logo/logo.jpg</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">fhs</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">fhs</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>fhs.se</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC3DCCAcSgAwIBAgIQeiUlh45dfrBO83XZelplYzANBgkqhkiG9w0BAQsFADAqMSgwJgYDVQQDEx9BREZTIEVuY3J5cHRpb24gLSBsb2dpbjEuZmhzLnNlMB4XDTIxMDEyNzEzNTYyNFoXDTIyMDEyNzEzNTYyNFowKjEoMCYGA1UEAxMfQURGUyBFbmNyeXB0aW9uIC0gbG9naW4xLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOUA1dNXEK4d1+xhV0linNYSdPrtHV9KUV+gNkHuruEDbDZ7fpgmHJlY5pjmeHfeQ+NY8NyLimBHIAt8RpdXzCRduplZZG+t26qX96dTIaQ8zji/mhuult9ZpEPqGBOG/1zxN5XnOvYhOcOz3oo1RLSvr5SHt1MEjym+CicobNKW1xfaDMRZXZYjshu21Bo0SliDoetrYhzDj/+pTF6Bm3Mx1r2Yi7wMEMs1SxqwRi7MWMUrSxYycOoxjUqa/jwJPcC21IPQi/5liBv8alS/NFs4V0ncmjWPueTgz4wGjYUEI7DXSgnu8/wS+NhWe+b8MfsIBN1tHmIkS8HjSnDQfd0CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAxa1cQeB9cD5kuJbASAUAnImFix6E5KUPdTGPcrflI40VSgvCecvZSLf2qKzCp+8Y9hoapzq5dvKytitCy87HOJq4pXVLH2fM5eqgj3FIJUeUfee+9cq2qU0LyhyH0ccvmJIlkWc8WUFy2KLjxlXFm0qER9mY0B71IZJ2pclB20excYncN7sg0Co7UuM2RlBi+SJ9EZCC2EIxHDtY/uQFj0D+sGzu0rS3nkt3WGP/YkEJbSIq1o7Max1grFEowAkYocpDZ7aOY+yEiOJWs8x716lYjnjmnMqU7qJcpikNpKFSKN+WxNpsgM51yRaZy9/YhMZXJMUe8LtQdQnBWgsUgA==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC1jCCAb6gAwIBAgIQN5ltbExep65FvrZhazb5gjANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIFNpZ25pbmcgLSBsb2dpbjEuZmhzLnNlMB4XDTIwMDIxNzEyMjAyOFoXDTIxMDIxNjEyMjAyOFowJzElMCMGA1UEAxMcQURGUyBTaWduaW5nIC0gbG9naW4xLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALRi86DTROB/y2F2JVZYPc4weGVOzVkk8eD+Hj2iPGNMxouVzOSrnDsLMkU+WitLlPESYboDnNwCVosDkM1OI7pdqFIVV2aWfzb1jNyZcIHu5GtLERr58vP0PzI27GEO51p/exyEf+yWv5CZNyajkEKk86DfrV2P4yuL83ysCsYyhaYEjZ0536rbqhHO/CaC5if2xBmgJ9Oy5vxRdcickG+smVra0UMcxX9iD0u7vM4l7T08Xpbwv/hfRm5CaLhOfWuB07pSnmm8CNYazG12WYuioYAgK+RNvvCzPYNLz8HEMYJrfUcHzjUHD4GwwojI280JC5WSYYWSskg2lweTlrkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAg0lT0u5MgZoxEBmMDhGHM+uPP9J9xGt+G56LTW9Istqhi3jI8vZfXuMShtPUqfKPFnGv/u9yGCEd9hkBpXTBK+3+GxdHCcsqZe03YloY3F3Qm4viewD+9+wfjgGdWbMMePgDZsTRzXPCxAd5BVO/bdyIvxWUnAMPj0LdRABLefjUJobYXh4wmSTDXc2DX39Y+JUCcp84EyjaxJqnUPzlp98zGj8cmcJV9A0BPCuE19iLI5dWHwZZHadBkS61Op+SZj93epmR7XaqrGEwzrieqwvtA78aUnyTmnjVDHLsQ2NA3njuQkPwCf4HKjwekDkza1ygWLW8SpPuZPotiWeTuA==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC1jCCAb6gAwIBAgIQFLCfqXXfQ7pLiPHJXOGZpDANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIFNpZ25pbmcgLSBsb2dpbjEuZmhzLnNlMB4XDTIxMDEyNzEzNTYyNVoXDTIyMDEyNzEzNTYyNVowJzElMCMGA1UEAxMcQURGUyBTaWduaW5nIC0gbG9naW4xLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKBEUJWHEbQWgBA55z4WMlGeBgp/f7tDhXzaxbQxz78b+/QiDhVLdQzr1ed5qAdSoVa3NCED+CLDIoKc10pE7zKA3mH2efnwEejXHZW2nfV674gBf/TfC/tbagr02Pu1uXBhOmeBoovtWYTP3dr2TS+PQ5+5+rZ55VbvgQvAsojJyPZSjPSmTfH8Pmib5RwQsDLR45XtwpK/3GcCTelwqqmVOTEVhxKD+bMkG/kn/f/POAJdm0CPXapDa9XvB20pqdjb2LrtwUsBYz/duuvdkqMPUsibxc2zlDiv/PiiEQIKdzJl0MSV3HpA/Ebf17CCVbJQc3aEqkiQDM9Z/T3djO0CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAZs82CPG1jfP4/0w5b8fVBrLl40iQttNq+js9HMXUNWJx+qnFJxJFCiSdbOPRnCXThag0mhSbUTAWD/Sc5tkXHTtwwhRfHWzKHmv/AQNXradNo8Il/ze+uImYJ3QdPsWcJnTNvdIPlLvmosFKo1swRKcE0IA+RLUs8Ak60R7mHErNadMFE+U78a6thjqAMYGFafouAg0Hmr5+0vqLl6wc9cAfNWEf+YWyp5COlRD6SCJMDxkSxZzXpPGBzi00vdx01o40e9hWube7CYiADMlftDQOV87s8Jz1SN0EiK+6PmPWmr5b7L+9dujdr6wBUD8NA/BiR516BW6rAuWQbp6tTw==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login1.fhs.se/adfs/services/trust/artifactresolution" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login1.fhs.se/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login1.fhs.se/adfs/ls/"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login1.fhs.se/adfs/ls/"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login1.fhs.se/adfs/ls/"/>
-  </IDPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="sv">Försvarshögskolan</OrganizationName>
-    <OrganizationName xml:lang="en">Swedish Defence University</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Försvarshögskolan</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Swedish Defence University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">http://www.fhs.se/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.fhs.se/en</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Swedish Defence University</Company>
-    <SurName>FHS IT Helpdesk</SurName>
-    <EmailAddress>mailto:helpdesk@fhs.se</EmailAddress>
-    <TelephoneNumber>+46 8 55342545</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Swedish Defence University</Company>
-    <SurName>FHS IT Helpdesk</SurName>
-    <EmailAddress>mailto:helpdesk@fhs.se</EmailAddress>
-    <TelephoneNumber>+46 8 55342545</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Swedish Defence University</Company>
-    <SurName>FHS IT Helpdesk</SurName>
-    <EmailAddress>mailto:helpdesk@fhs.se</EmailAddress>
-    <TelephoneNumber>+46 8 55342545</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml
index 509c17f2..ec68b8bb 100644
--- a/swamid-edugain-idp-1.0.mxml
+++ b/swamid-edugain-idp-1.0.mxml
@@ -29,7 +29,6 @@
   <xi:include href="swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.ths.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/weblogin.kau.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/login1.fhs.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/idp3.it.gu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.hj.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.sunet.se-idp.xml"/>