SWAMIDOPS-6176 moved from nya-testing to swamid-testing

author: Johan Berggren <jbn@nordu.net> 2011-02-14 13:00:31 +0100
committer: Johan Berggren <jbn@nordu.net> 2011-02-14 13:00:31 +0100
commit: 40328ae2f1cd11d7f48092625cefc3bec52dc83f (patch)
tree: e421c3c3939d485bc7d1e8586a00753c0dfed503 /nya-1.0
parent: 8dde092fb4aa6b14f48939ec5afb34d704d86115 (diff)
20 files changed, 0 insertions, 1370 deletions
diff --git a/nya-1.0/nya-16.ladok.umu.se-aws-sp.xml b/nya-1.0/nya-16.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 8b1c1603..00000000
--- a/nya-1.0/nya-16.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-16.ladok.umu.se/aws-sp">
-
-  <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:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-16.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-16.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-16.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANrj2jIWBkK3MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xNi5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDAzWhcNMjEwMjA4
-MDYzMDAzWjAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3DRKG7KPX4zKZPQ8Zwe04nkWUsRNYE8s
-X0o8xqnfYuSpOHe2FoxuqEfculKQXPZVNiwxbV0gSROGP37R/2EIVoM6iAviiqyL
-OWGjZsuus6qTEUf7aFnhUF6xaANeyhC5TfM1JpWNDdmUVOuphl4kG0xNKWyKc+au
-WBw9/hPAfJ+npbpJ4euEQzgZAZzne8NFRL9ZODLUb0affPrROFG0V5k8myXQe8o/
-8LgTX05q5OxlFvh3iilZ3hTgGXasLWblQHE14lQNF7K2wOcH6W2Lsbwz0lk4ZBKM
-1WngIwstD3bKkdIyvsc4Kc7R5Mi5VxCwbMqaxB0K6Ufoy49qh+MqoQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTYubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-Ni5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBTpqYomq43TEIegKcLLYfhc
-SnmNCzANBgkqhkiG9w0BAQUFAAOCAQEAyiyt2FrUTznCjn4zGjidlGy/IWFS4fSZ
-T/TFWnEmpWvshxQrHAn0B7B/vkvvP44BexM6u6ztpfwFOkPE1XTsZoEC39zP/Urr
-wCOWSyqgdo6V19WvlDVSvzZUWX5PO8v6r1L8LhhdEYl7yzrLECPjHFwI0C/wA1mS
-E0cdmb9XLO9yjlBu7yqVJ92dqusAf92Jlz1uueToDgyK3MnRJRguD5aPv0yg+JkO
-b/ww2LTOR929U9YkjBUukM6dKPM0kYISPjVOPJCfivOA89/ZULWT28lmL/CET4Oh
-jl5VAnadb+E4/k9GzSwWtiR0p8Uv2arCq1/gzt1qDp3m37+C+pJ+wg==
-</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>https://nya-16.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-16.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-16.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANrj2jIWBkK3MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xNi5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDAzWhcNMjEwMjA4
-MDYzMDAzWjAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3DRKG7KPX4zKZPQ8Zwe04nkWUsRNYE8s
-X0o8xqnfYuSpOHe2FoxuqEfculKQXPZVNiwxbV0gSROGP37R/2EIVoM6iAviiqyL
-OWGjZsuus6qTEUf7aFnhUF6xaANeyhC5TfM1JpWNDdmUVOuphl4kG0xNKWyKc+au
-WBw9/hPAfJ+npbpJ4euEQzgZAZzne8NFRL9ZODLUb0affPrROFG0V5k8myXQe8o/
-8LgTX05q5OxlFvh3iilZ3hTgGXasLWblQHE14lQNF7K2wOcH6W2Lsbwz0lk4ZBKM
-1WngIwstD3bKkdIyvsc4Kc7R5Mi5VxCwbMqaxB0K6Ufoy49qh+MqoQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTYubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-Ni5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBTpqYomq43TEIegKcLLYfhc
-SnmNCzANBgkqhkiG9w0BAQUFAAOCAQEAyiyt2FrUTznCjn4zGjidlGy/IWFS4fSZ
-T/TFWnEmpWvshxQrHAn0B7B/vkvvP44BexM6u6ztpfwFOkPE1XTsZoEC39zP/Urr
-wCOWSyqgdo6V19WvlDVSvzZUWX5PO8v6r1L8LhhdEYl7yzrLECPjHFwI0C/wA1mS
-E0cdmb9XLO9yjlBu7yqVJ92dqusAf92Jlz1uueToDgyK3MnRJRguD5aPv0yg+JkO
-b/ww2LTOR929U9YkjBUukM6dKPM0kYISPjVOPJCfivOA89/ZULWT28lmL/CET4Oh
-jl5VAnadb+E4/k9GzSwWtiR0p8Uv2arCq1/gzt1qDp3m37+C+pJ+wg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
diff --git a/nya-1.0/nya-16.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-16.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 53ad2c29..00000000
--- a/nya-1.0/nya-16.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-16.ladok.umu.se/dw-idp">
-
-    <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
-        <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-        </Extensions>
-
-        <KeyDescriptor>
-            <ds:KeyInfo>
-                <ds:X509Data>
-                    <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAIoPcKy6tnLhMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNi5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA0WhcNMjEwMjA4MDYzMDA0WjAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMl3+ymieJ85Hbmjg7NoMWqiodJ4pKjfHJLLlbip8A/c4hm17Bhy2JrFXDZA3sKrmPVeOyGdPTp9bkFJpz0wy50CAwEAAaN/MH0wHQYDVR0OBBYEFLIKgU2us9/k1tHFqNReFBoWCC8fME4GA1UdIwRHMEWAFLIKgU2us9/k1tHFqNReFBoWCC8foSKkIDAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlggkAig9wrLq2cuEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALy/mxWz7aHKHV3PIqNqFG6NoRdYdjAWcHL/peRt1gIctjLNOtdUL2gBkfxATCwufFpDEqwx0EvIreKYPiwbPuo=
-                    </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-16.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-                                   
-        <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://nya-16.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-        
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-16.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-16.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-        
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-16.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-    </IDPSSODescriptor>
-
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
-        <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-        </Extensions>
-
-        <KeyDescriptor>
-            <ds:KeyInfo>
-                <ds:X509Data>
-                    <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAIoPcKy6tnLhMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNi5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA0WhcNMjEwMjA4MDYzMDA0WjAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMl3+ymieJ85Hbmjg7NoMWqiodJ4pKjfHJLLlbip8A/c4hm17Bhy2JrFXDZA3sKrmPVeOyGdPTp9bkFJpz0wy50CAwEAAaN/MH0wHQYDVR0OBBYEFLIKgU2us9/k1tHFqNReFBoWCC8fME4GA1UdIwRHMEWAFLIKgU2us9/k1tHFqNReFBoWCC8foSKkIDAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlggkAig9wrLq2cuEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALy/mxWz7aHKHV3PIqNqFG6NoRdYdjAWcHL/peRt1gIctjLNOtdUL2gBkfxATCwufFpDEqwx0EvIreKYPiwbPuo=
-                    </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-16.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-        
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-        
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-        
-    </AttributeAuthorityDescriptor>
-    
-</EntityDescriptor>
diff --git a/nya-1.0/nya-16.ladok.umu.se-ecs-sp.xml b/nya-1.0/nya-16.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index a856fb2d..00000000
--- a/nya-1.0/nya-16.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-16.ladok.umu.se/ecs-sp">
-
-  <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:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-16.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-16.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-16.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANOmErsQrSNvMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xNi5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA0WhcNMjEwMjA4
-MDYzMDA0WjAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApDBfmRg3HpFoqMzXVqrpkmYyMEoo93hx
-URtfL02+Eo27r5lvBI73iFbIr8Y2z0vTEEc4cx2nC0jA9BSA65XCNi3KxwchDRWv
-DufnsOJoD+ImQyujhSWmFq7cnwRmrE1THAmn2Gn+Ktps0Tlbe4XxYi67kqQhiGW9
-vdBqispl9MpCG/9Ebd6+m4DvHdBhlWmjADlIdk8l7hudUGaQ0a5tn0s/w2ODLqZt
-LYGFikFh5CUbf3Tk9hRxQ3iRFfbia+JJ+YC18f/DptaQ+9DWjB7dvRGWdkK/85oK
-xNZwFN1l0r982M04BiYoVcZdf+O0lH2A7Lnn39mx6UEVJ0IvAxv/ZwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTYubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-Ni5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBTWuGMofab2XeGnO494wJzC
-2SQ9STANBgkqhkiG9w0BAQUFAAOCAQEAShUMdXqpSmdOg+WZDUPONMKagJmr/cmh
-rH0/f+iRDwWIjtTLfkE9CQ2ID/LQ4pMGkD0gPQynTWgTNK3+Chua2zfpg1vx2EV3
-M7vSJSheHPN+HKPnkkt1n3numAzLvDkUt98XXnUrwu0+MdHYTkE3fmcs2W0WNWIz
-9m4X2ZohniblG15LsaP5nmDHceDlmfg2Sq2FAsrZgl6zvCU1UUMxLnABdjTBw8QQ
-v5vgi77VvlDJlZEWKbbpQtVVNuDfoTrd+dw5zrPJliFdHkzIkMNoBggwEttO849r
-zqyiUXEA9xCj9ihZQenCbh7FZHXbp7fvA07EwU180jWHm8gh3XUDjA==
-</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>https://nya-16.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-16.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-16.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANOmErsQrSNvMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xNi5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA0WhcNMjEwMjA4
-MDYzMDA0WjAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApDBfmRg3HpFoqMzXVqrpkmYyMEoo93hx
-URtfL02+Eo27r5lvBI73iFbIr8Y2z0vTEEc4cx2nC0jA9BSA65XCNi3KxwchDRWv
-DufnsOJoD+ImQyujhSWmFq7cnwRmrE1THAmn2Gn+Ktps0Tlbe4XxYi67kqQhiGW9
-vdBqispl9MpCG/9Ebd6+m4DvHdBhlWmjADlIdk8l7hudUGaQ0a5tn0s/w2ODLqZt
-LYGFikFh5CUbf3Tk9hRxQ3iRFfbia+JJ+YC18f/DptaQ+9DWjB7dvRGWdkK/85oK
-xNZwFN1l0r982M04BiYoVcZdf+O0lH2A7Lnn39mx6UEVJ0IvAxv/ZwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTYubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-Ni5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBTWuGMofab2XeGnO494wJzC
-2SQ9STANBgkqhkiG9w0BAQUFAAOCAQEAShUMdXqpSmdOg+WZDUPONMKagJmr/cmh
-rH0/f+iRDwWIjtTLfkE9CQ2ID/LQ4pMGkD0gPQynTWgTNK3+Chua2zfpg1vx2EV3
-M7vSJSheHPN+HKPnkkt1n3numAzLvDkUt98XXnUrwu0+MdHYTkE3fmcs2W0WNWIz
-9m4X2ZohniblG15LsaP5nmDHceDlmfg2Sq2FAsrZgl6zvCU1UUMxLnABdjTBw8QQ
-v5vgi77VvlDJlZEWKbbpQtVVNuDfoTrd+dw5zrPJliFdHkzIkMNoBggwEttO849r
-zqyiUXEA9xCj9ihZQenCbh7FZHXbp7fvA07EwU180jWHm8gh3XUDjA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
diff --git a/nya-1.0/nya-16.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nya-16.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index f3eddfa2..00000000
--- a/nya-1.0/nya-16.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-16.ladok.umu.se/shibboleth-idp">
-
-    <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
-        <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-        </Extensions>
-
-        <KeyDescriptor>
-            <ds:KeyInfo>
-                <ds:X509Data>
-                    <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAIeAlVuqfrOsMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNi5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA1WhcNMjEwMjA4MDYzMDA1WjAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK582cq6S4Ow3OBAXF1BT5KMNALtHp0HSCun939tNzdJHuD/fs1uglAcOXcNqZI7TRXgi7hltIhA7gAFU3xNotMCAwEAAaN/MH0wHQYDVR0OBBYEFIPz3+39iVSDAawyywIVwyBXZwdwME4GA1UdIwRHMEWAFIPz3+39iVSDAawyywIVwyBXZwdwoSKkIDAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlggkAh4CVW6p+s6wwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAAEuu7MXLbhaqhk2QqrrTJp05YnLTG7b99Ujlc2GM3ImblVq0nPIieyl/wVwBdlbnWKBLncRgIqdrlEgX9oFrYo=
-                    </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-16.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-                                   
-        <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://nya-16.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-        
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-16.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-16.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-        
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-16.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-    </IDPSSODescriptor>
-
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
-        <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-        </Extensions>
-
-        <KeyDescriptor>
-            <ds:KeyInfo>
-                <ds:X509Data>
-                    <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAIeAlVuqfrOsMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNi5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA1WhcNMjEwMjA4MDYzMDA1WjAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK582cq6S4Ow3OBAXF1BT5KMNALtHp0HSCun939tNzdJHuD/fs1uglAcOXcNqZI7TRXgi7hltIhA7gAFU3xNotMCAwEAAaN/MH0wHQYDVR0OBBYEFIPz3+39iVSDAawyywIVwyBXZwdwME4GA1UdIwRHMEWAFIPz3+39iVSDAawyywIVwyBXZwdwoSKkIDAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlggkAh4CVW6p+s6wwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAAEuu7MXLbhaqhk2QqrrTJp05YnLTG7b99Ujlc2GM3ImblVq0nPIieyl/wVwBdlbnWKBLncRgIqdrlEgX9oFrYo=
-                    </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-16.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-        
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-        
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-        
-    </AttributeAuthorityDescriptor>
-    
-</EntityDescriptor>
diff --git a/nya-1.0/nya-17.ladok.umu.se-aws-sp.xml b/nya-1.0/nya-17.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 5f89c864..00000000
--- a/nya-1.0/nya-17.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-17.ladok.umu.se/aws-sp">
-
-  <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:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-17.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-17.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-17.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIc/FExfYq+AMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xNy5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA2WhcNMjEwMjA4
-MDYzMDA2WjAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxoTPC9BSjlUw89mL0/2CBs8CMmI1iVwq
-1D1e3CoTUydpJ8CnJiSk6FHXhVsU5JbHFx5fecvDzcoXz73HeZR1y6niE/5IHuID
-AZs3Gpt+stRLDj14Dz0e0W645KV2LXat2AJWvCFsgBeVjmV06ySGv7M8Gu/VVlUs
-2pplhhvYkIW/dQziTN9zsPrxE6rg5x69xfkCJxFZxIKiq5wTzkGxmEItoJEC2Z44
-lSsEfqPfs4qq5Ga/D5bVaMYX6ZLGfCTnaIp2kQFepnbRx1kt5EDfwKcrBfIZiKDG
-MvsdzvjCRNftkdWI5pittlaUH+ZzhcyVto5XweaECyucQDxVWPuMjQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTcubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-Ny5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRW5LeNB9A98NTsIeeUHjF2
-2GJuRTANBgkqhkiG9w0BAQUFAAOCAQEAPpUbzWGHQ6Ri70zXgOV7KfJqubC5nKoS
-1IkkGRBRUe5qbQoTnrapW16Xgy7QAu/c58NqoaDaz03VbNrBuX7lfpYPr3DtSx6o
-CbmyxBA2H3Wefugnv/d4ngRhJzol2btJyhGD5l1zCfrPgFsRMtgVVwNNlBHScCza
-HBAAgxdgK7nsZIfTCGbUVzsVnkRatFt9qE7DWK1Lzc8nh0eUXpmBF7BKgUoO70LB
-z4XDZ3jsIvDuHopN8NJCa0su9qNpzgZdN3afvgyqMTpYBdMvUG9i/mkgzY6wnj2J
-mBLbTEgd82FHOsjHBGCNpKLEtUeClgJQ1jt7hyFC5Z2prF954OXu7w==
-</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>https://nya-17.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-17.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-17.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIc/FExfYq+AMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xNy5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA2WhcNMjEwMjA4
-MDYzMDA2WjAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxoTPC9BSjlUw89mL0/2CBs8CMmI1iVwq
-1D1e3CoTUydpJ8CnJiSk6FHXhVsU5JbHFx5fecvDzcoXz73HeZR1y6niE/5IHuID
-AZs3Gpt+stRLDj14Dz0e0W645KV2LXat2AJWvCFsgBeVjmV06ySGv7M8Gu/VVlUs
-2pplhhvYkIW/dQziTN9zsPrxE6rg5x69xfkCJxFZxIKiq5wTzkGxmEItoJEC2Z44
-lSsEfqPfs4qq5Ga/D5bVaMYX6ZLGfCTnaIp2kQFepnbRx1kt5EDfwKcrBfIZiKDG
-MvsdzvjCRNftkdWI5pittlaUH+ZzhcyVto5XweaECyucQDxVWPuMjQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTcubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-Ny5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRW5LeNB9A98NTsIeeUHjF2
-2GJuRTANBgkqhkiG9w0BAQUFAAOCAQEAPpUbzWGHQ6Ri70zXgOV7KfJqubC5nKoS
-1IkkGRBRUe5qbQoTnrapW16Xgy7QAu/c58NqoaDaz03VbNrBuX7lfpYPr3DtSx6o
-CbmyxBA2H3Wefugnv/d4ngRhJzol2btJyhGD5l1zCfrPgFsRMtgVVwNNlBHScCza
-HBAAgxdgK7nsZIfTCGbUVzsVnkRatFt9qE7DWK1Lzc8nh0eUXpmBF7BKgUoO70LB
-z4XDZ3jsIvDuHopN8NJCa0su9qNpzgZdN3afvgyqMTpYBdMvUG9i/mkgzY6wnj2J
-mBLbTEgd82FHOsjHBGCNpKLEtUeClgJQ1jt7hyFC5Z2prF954OXu7w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
diff --git a/nya-1.0/nya-17.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-17.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 9bb4bfbf..00000000
--- a/nya-1.0/nya-17.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-17.ladok.umu.se/dw-idp">
-
-    <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
-        <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-        </Extensions>
-
-        <KeyDescriptor>
-            <ds:KeyInfo>
-                <ds:X509Data>
-                    <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJALEI/5f+C8s1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNy5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA4WhcNMjEwMjA4MDYzMDA4WjAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMfX5QXxKcCtXSsy14mzHytT9PjAw8gvBpB3atUvm/8t02GLwp9MYxAfFeNVq3IuiHmpKpZU567WBaagfKWoDykCAwEAAaN/MH0wHQYDVR0OBBYEFKMt4SIRNGRYKGHjBytuxuU6tp20ME4GA1UdIwRHMEWAFKMt4SIRNGRYKGHjBytuxuU6tp20oSKkIDAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlggkAsQj/l/4LyzUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEhHFUqDz8BAE1A+yzuU/8LjasuAC6qQI9g9K9CKsqFT97tfl9MwwMTefT5iBa/0vMT8XEO8Xb3HUK/mLcuJ6us=
-                    </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-17.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-                                   
-        <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://nya-17.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-        
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-17.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-        
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-17.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-    </IDPSSODescriptor>
-
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
-        <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-        </Extensions>
-
-        <KeyDescriptor>
-            <ds:KeyInfo>
-                <ds:X509Data>
-                    <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJALEI/5f+C8s1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNy5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA4WhcNMjEwMjA4MDYzMDA4WjAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMfX5QXxKcCtXSsy14mzHytT9PjAw8gvBpB3atUvm/8t02GLwp9MYxAfFeNVq3IuiHmpKpZU567WBaagfKWoDykCAwEAAaN/MH0wHQYDVR0OBBYEFKMt4SIRNGRYKGHjBytuxuU6tp20ME4GA1UdIwRHMEWAFKMt4SIRNGRYKGHjBytuxuU6tp20oSKkIDAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlggkAsQj/l/4LyzUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEhHFUqDz8BAE1A+yzuU/8LjasuAC6qQI9g9K9CKsqFT97tfl9MwwMTefT5iBa/0vMT8XEO8Xb3HUK/mLcuJ6us=
-                    </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-17.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-        
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-        
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-        
-    </AttributeAuthorityDescriptor>
-    
-</EntityDescriptor>
diff --git a/nya-1.0/nya-17.ladok.umu.se-ecs-sp.xml b/nya-1.0/nya-17.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index c5f5050d..00000000
--- a/nya-1.0/nya-17.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-17.ladok.umu.se/ecs-sp">
-
-  <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:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-17.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-17.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-17.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJLzeYJMjySuMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xNy5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA3WhcNMjEwMjA4
-MDYzMDA3WjAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAweFKMrpruuM+TvzERHub4fpt/w8UqRjJ
-YY3/qg4f9e2ihEMLVwSauY4eQHUmbdPbdIgDcpNjT1VSmHqE7vTBQH03nc3id4MX
-0dIMuwQywc0+SJ9Qm42qBbbdONnXHKzUc8F3eNwAuVf/3L8xNQ/dgsZQg23B1RgH
-bei51bCvTBxRqsxhOJQ20bBKXsSCQML6J4YJA3RhaGyqRwEKuiAVeiU4EQMIIHvZ
-yc2oGzHwLfxGucacqHKCJBWhau9quBNJ94vUpD0kVZAXWE8ws/m73Nquw0SF2kPO
-DPI+WELyKoDVsc8uHB2PG56vlsM8V6guWArI6ETaovlQ/qLLljAa+wIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTcubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-Ny5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQ8DNey5wUHYFRCfmP0y6WT
-ZTZsnTANBgkqhkiG9w0BAQUFAAOCAQEAPcHu1bVVi5yTB4Xc41MDWalKuCTY95/R
-ZLfh6Y4nTifITdI/rdXaPXVwKsXatHe18zCDnqmRXBPMdsUN/XBrzkitBqOAT/S+
-Ca93pZ2oDcsHLHaUpaBGazXEmw5Y1wJCPWaoUbGoyCWwYtpWNwbiAGtwTJaR01Bb
-x0YPR/ttJNGmhODgNKEhcjdaPKfP7ZeyGNfYu29uOzSJRuzOFy0YSUSAvXjoWWxH
-gGEItPYEhiXzhBKyxov5uv84rrCaHdhLnK2oekNkD4Sj9hxZQfrdAaiu+8W8gRTb
-ECwLl7pAoHdX5PKqhXh4PpbWDXmh+1Dh1hr3AFLaFFpqn75qMew+TA==
-</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>https://nya-17.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-17.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-17.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJLzeYJMjySuMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xNy5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA3WhcNMjEwMjA4
-MDYzMDA3WjAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAweFKMrpruuM+TvzERHub4fpt/w8UqRjJ
-YY3/qg4f9e2ihEMLVwSauY4eQHUmbdPbdIgDcpNjT1VSmHqE7vTBQH03nc3id4MX
-0dIMuwQywc0+SJ9Qm42qBbbdONnXHKzUc8F3eNwAuVf/3L8xNQ/dgsZQg23B1RgH
-bei51bCvTBxRqsxhOJQ20bBKXsSCQML6J4YJA3RhaGyqRwEKuiAVeiU4EQMIIHvZ
-yc2oGzHwLfxGucacqHKCJBWhau9quBNJ94vUpD0kVZAXWE8ws/m73Nquw0SF2kPO
-DPI+WELyKoDVsc8uHB2PG56vlsM8V6guWArI6ETaovlQ/qLLljAa+wIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTcubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-Ny5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQ8DNey5wUHYFRCfmP0y6WT
-ZTZsnTANBgkqhkiG9w0BAQUFAAOCAQEAPcHu1bVVi5yTB4Xc41MDWalKuCTY95/R
-ZLfh6Y4nTifITdI/rdXaPXVwKsXatHe18zCDnqmRXBPMdsUN/XBrzkitBqOAT/S+
-Ca93pZ2oDcsHLHaUpaBGazXEmw5Y1wJCPWaoUbGoyCWwYtpWNwbiAGtwTJaR01Bb
-x0YPR/ttJNGmhODgNKEhcjdaPKfP7ZeyGNfYu29uOzSJRuzOFy0YSUSAvXjoWWxH
-gGEItPYEhiXzhBKyxov5uv84rrCaHdhLnK2oekNkD4Sj9hxZQfrdAaiu+8W8gRTb
-ECwLl7pAoHdX5PKqhXh4PpbWDXmh+1Dh1hr3AFLaFFpqn75qMew+TA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
diff --git a/nya-1.0/nya-17.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nya-17.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 0f5048c6..00000000
--- a/nya-1.0/nya-17.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-17.ladok.umu.se/shibboleth-idp">
-
-    <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
-        <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-        </Extensions>
-
-        <KeyDescriptor>
-            <ds:KeyInfo>
-                <ds:X509Data>
-                    <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAMbTCE8eqD41MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNy5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA5WhcNMjEwMjA4MDYzMDA5WjAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANlALlAK/0mT6QhWmbT/9GCFCw7ii7dTLClGBeEdzN3GS9sc3CsM+66G2eKQETBRNVEeoPjRJw8vMEPfYXt+CPUCAwEAAaN/MH0wHQYDVR0OBBYEFPje4tlzwgC/L3VKUqT8usyU41vNME4GA1UdIwRHMEWAFPje4tlzwgC/L3VKUqT8usyU41vNoSKkIDAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlggkAxtMITx6oPjUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAMKBoq1RWdLUiH/Yf7ESVCAs4lDo6SUVoolHu7ZUatBK16PSTU1DAFq2u65wVU8+18+CUy+bLLnlwXNA/WjrgaQ=
-                    </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-17.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-                                   
-        <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://nya-17.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-        
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-17.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-        
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-17.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-    </IDPSSODescriptor>
-
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
-        <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-        </Extensions>
-
-        <KeyDescriptor>
-            <ds:KeyInfo>
-                <ds:X509Data>
-                    <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAMbTCE8eqD41MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNy5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA5WhcNMjEwMjA4MDYzMDA5WjAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANlALlAK/0mT6QhWmbT/9GCFCw7ii7dTLClGBeEdzN3GS9sc3CsM+66G2eKQETBRNVEeoPjRJw8vMEPfYXt+CPUCAwEAAaN/MH0wHQYDVR0OBBYEFPje4tlzwgC/L3VKUqT8usyU41vNME4GA1UdIwRHMEWAFPje4tlzwgC/L3VKUqT8usyU41vNoSKkIDAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlggkAxtMITx6oPjUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAMKBoq1RWdLUiH/Yf7ESVCAs4lDo6SUVoolHu7ZUatBK16PSTU1DAFq2u65wVU8+18+CUy+bLLnlwXNA/WjrgaQ=
-                    </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-17.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-        
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-        
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-        
-    </AttributeAuthorityDescriptor>
-    
-</EntityDescriptor>
diff --git a/nya-1.0/nya-18.ladok.umu.se-aws-sp.xml b/nya-1.0/nya-18.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index cbee8e5e..00000000
--- a/nya-1.0/nya-18.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-18.ladok.umu.se/aws-sp">
-
-  <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:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-18.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-18.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-18.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANz6xPrAunzRMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xOC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDEwWhcNMjEwMjA4
-MDYzMDEwWjAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApStBOynWq4AwKzRApwYwzum1gGTYVr6X
-qSEazkKnNz7SBTENvAyMxylFiqE+E0xSJQ2fUNKkFo8iQNyW3CDOGKiEKfDm8wU8
-2Eo5QiiuTKvrJslKYpl+WVxa1SsfvxFAFPO1K7iwVqtuhMhhL9HAHG9RpsXXs9il
-JelBXtJtJQPfe1GnO9UyfivZ66bIRZBAWfGNLRGOYrZYkos8MJ02omIvFm2cttwu
-PuorkGevfBtPebCpX2dGIKkncc2KDY80CCBfi0llp9hKhYQZBRCMBl9h5mNH5Z5S
-pCDwKkRtYZ7Jxmi8rD7A7IwcGIng/OYxNp8d7nU010h/dN6Cj2f+jQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTgubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-OC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBTnSFx9KUha74KSSQCsVtFg
-1z7fpjANBgkqhkiG9w0BAQUFAAOCAQEAlYc1tIA8bQVXREw8LRRfgVIGJFfgcciU
-tcVW+e2zEt0DT/f69nPqO9EGyate2+QiQeEsEDlVXuymjAUED5fJu5WNdysoF2SQ
-dvZ+oAMaW++bF2RPnKbUYT7iQXZnDhIvneFgeZoGhC+JiB3bhNuTs11ObRshXLC0
-pmOsKdRVNVK4IrJmt04Y1BBCzrQefjAcXMCmCpi7KeCY/pJLtWN8/RDSjbPEZYbe
-Ou+/c3n9AC9RwrLCz3jJXNuind05rW4pl//OFTitGTMkogYHxp0lDqA+AHb+HnCY
-9DDP/KdVkLuF0vN9jrBfoU9txTml0vqTfylynfdj0HzjKhJPeBOH5A==
-</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>https://nya-18.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-18.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-18.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANz6xPrAunzRMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xOC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDEwWhcNMjEwMjA4
-MDYzMDEwWjAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApStBOynWq4AwKzRApwYwzum1gGTYVr6X
-qSEazkKnNz7SBTENvAyMxylFiqE+E0xSJQ2fUNKkFo8iQNyW3CDOGKiEKfDm8wU8
-2Eo5QiiuTKvrJslKYpl+WVxa1SsfvxFAFPO1K7iwVqtuhMhhL9HAHG9RpsXXs9il
-JelBXtJtJQPfe1GnO9UyfivZ66bIRZBAWfGNLRGOYrZYkos8MJ02omIvFm2cttwu
-PuorkGevfBtPebCpX2dGIKkncc2KDY80CCBfi0llp9hKhYQZBRCMBl9h5mNH5Z5S
-pCDwKkRtYZ7Jxmi8rD7A7IwcGIng/OYxNp8d7nU010h/dN6Cj2f+jQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTgubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-OC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBTnSFx9KUha74KSSQCsVtFg
-1z7fpjANBgkqhkiG9w0BAQUFAAOCAQEAlYc1tIA8bQVXREw8LRRfgVIGJFfgcciU
-tcVW+e2zEt0DT/f69nPqO9EGyate2+QiQeEsEDlVXuymjAUED5fJu5WNdysoF2SQ
-dvZ+oAMaW++bF2RPnKbUYT7iQXZnDhIvneFgeZoGhC+JiB3bhNuTs11ObRshXLC0
-pmOsKdRVNVK4IrJmt04Y1BBCzrQefjAcXMCmCpi7KeCY/pJLtWN8/RDSjbPEZYbe
-Ou+/c3n9AC9RwrLCz3jJXNuind05rW4pl//OFTitGTMkogYHxp0lDqA+AHb+HnCY
-9DDP/KdVkLuF0vN9jrBfoU9txTml0vqTfylynfdj0HzjKhJPeBOH5A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
diff --git a/nya-1.0/nya-18.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-18.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 8b208b8d..00000000
--- a/nya-1.0/nya-18.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-18.ladok.umu.se/dw-idp">
-
-    <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
-        <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-        </Extensions>
-
-        <KeyDescriptor>
-            <ds:KeyInfo>
-                <ds:X509Data>
-                    <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAP8ddkdvmL6aMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDExWhcNMjEwMjA4MDYzMDExWjAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKsFUSxnW6U6w9L+QCCU8yMcU6fQcVKS6tnk200CC7G1YHhx/coB4l1GCqH0fUvKq2eyWhiIJC5e1sxMaixo3XcCAwEAAaN/MH0wHQYDVR0OBBYEFLqc/N3R6SgYw185VBo+pBlNZbEnME4GA1UdIwRHMEWAFLqc/N3R6SgYw185VBo+pBlNZbEnoSKkIDAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlggkA/x12R2+YvpowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKflv/JlW+NqQuFPhHx5C19O/ScUIKmUNRrZo6UMWpzmyi8k6HG9klc6wJ5j+aexwHMastVVvNl8O6P+HPwEehQ=
-                    </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-18.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-                                   
-        <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://nya-18.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-        
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-18.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-18.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-        
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-18.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-    </IDPSSODescriptor>
-
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
-        <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-        </Extensions>
-
-        <KeyDescriptor>
-            <ds:KeyInfo>
-                <ds:X509Data>
-                    <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAP8ddkdvmL6aMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDExWhcNMjEwMjA4MDYzMDExWjAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKsFUSxnW6U6w9L+QCCU8yMcU6fQcVKS6tnk200CC7G1YHhx/coB4l1GCqH0fUvKq2eyWhiIJC5e1sxMaixo3XcCAwEAAaN/MH0wHQYDVR0OBBYEFLqc/N3R6SgYw185VBo+pBlNZbEnME4GA1UdIwRHMEWAFLqc/N3R6SgYw185VBo+pBlNZbEnoSKkIDAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlggkA/x12R2+YvpowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKflv/JlW+NqQuFPhHx5C19O/ScUIKmUNRrZo6UMWpzmyi8k6HG9klc6wJ5j+aexwHMastVVvNl8O6P+HPwEehQ=
-                    </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-18.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-        
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-        
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-        
-    </AttributeAuthorityDescriptor>
-    
-</EntityDescriptor>
diff --git a/nya-1.0/nya-18.ladok.umu.se-ecs-sp.xml b/nya-1.0/nya-18.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index cffd282a..00000000
--- a/nya-1.0/nya-18.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-18.ladok.umu.se/ecs-sp">
-
-  <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:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-18.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-18.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-18.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPaOYe2VSoQUMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xOC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDExWhcNMjEwMjA4
-MDYzMDExWjAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxA0jnM15oF28eH75fJWmca5MLEVle3qN
-YXbcCFrOcagIkC2BuXeCXlPZFHl9PrtutR3OAsAWR930YDxiAmKZVY+HI0uDPw6/
-hFjZo/Q+i8BosKp872qtlpM34TH+8c1FRWpj7ag8lcNKQXHmbgdQbgtCL8u6mWg5
-QK8SuFqI7EHoO3gy5hUm/bB/LBSxF7Llqrlb7of62zM48fsFvuZR+hQYoEPFanu1
-qCXlVfISZy4sH/C4b0joC2vjWgwEOlrDnzCumbNaXKuB6esu/NkP86ZYyzQiDaG4
-M2dkbttjtbx1L/WCpTWTPdyLnmCyibBWwAUEBB5TBsYjxpI+99pfhQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTgubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-OC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBSfAMLMkgvvpzKT1zBRW8p1
-UaJ1QjANBgkqhkiG9w0BAQUFAAOCAQEATazLdy5mdxOtpjgN66QK/0sHyBQ1Lxk/
-FbwOxMZv2LY4OMHrwLe/VYizg+b+wP5FMe8SP8+mzLI0Y9F4+8b6DRJaUbRilubo
-464T5PNK2ciL1ROSlCmMlFe+V/bdi/AYbS3IRCH2d7JV/Let2zB4cA4sCVlTpwLk
-KPzxCZ4lcmm373gKa4RgCYSDMgMDDcETRy9iCrjhqtd4iVBwq0db/CLj15tN9meF
-kdgJQJhkP9Tjqlm/GDkSAaOtqtWb694v25xOoZ09KhmH4BjNmEgQ0+KayC9TxaqL
-hqoEJrT/VOpdDv4cepDFT+DtuJzyx7UyZTrVc/mHu6UCMuozleXcyw==
-</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>https://nya-18.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-18.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-18.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPaOYe2VSoQUMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xOC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDExWhcNMjEwMjA4
-MDYzMDExWjAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxA0jnM15oF28eH75fJWmca5MLEVle3qN
-YXbcCFrOcagIkC2BuXeCXlPZFHl9PrtutR3OAsAWR930YDxiAmKZVY+HI0uDPw6/
-hFjZo/Q+i8BosKp872qtlpM34TH+8c1FRWpj7ag8lcNKQXHmbgdQbgtCL8u6mWg5
-QK8SuFqI7EHoO3gy5hUm/bB/LBSxF7Llqrlb7of62zM48fsFvuZR+hQYoEPFanu1
-qCXlVfISZy4sH/C4b0joC2vjWgwEOlrDnzCumbNaXKuB6esu/NkP86ZYyzQiDaG4
-M2dkbttjtbx1L/WCpTWTPdyLnmCyibBWwAUEBB5TBsYjxpI+99pfhQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTgubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-OC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBSfAMLMkgvvpzKT1zBRW8p1
-UaJ1QjANBgkqhkiG9w0BAQUFAAOCAQEATazLdy5mdxOtpjgN66QK/0sHyBQ1Lxk/
-FbwOxMZv2LY4OMHrwLe/VYizg+b+wP5FMe8SP8+mzLI0Y9F4+8b6DRJaUbRilubo
-464T5PNK2ciL1ROSlCmMlFe+V/bdi/AYbS3IRCH2d7JV/Let2zB4cA4sCVlTpwLk
-KPzxCZ4lcmm373gKa4RgCYSDMgMDDcETRy9iCrjhqtd4iVBwq0db/CLj15tN9meF
-kdgJQJhkP9Tjqlm/GDkSAaOtqtWb694v25xOoZ09KhmH4BjNmEgQ0+KayC9TxaqL
-hqoEJrT/VOpdDv4cepDFT+DtuJzyx7UyZTrVc/mHu6UCMuozleXcyw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
diff --git a/nya-1.0/nya-18.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nya-18.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index a9bd04f5..00000000
--- a/nya-1.0/nya-18.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-18.ladok.umu.se/shibboleth-idp">
-
-    <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
-        <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-        </Extensions>
-
-        <KeyDescriptor>
-            <ds:KeyInfo>
-                <ds:X509Data>
-                    <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAN2GYXESGBFpMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDEyWhcNMjEwMjA4MDYzMDEyWjAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMFjOGScAuxeZLjNtwUA+iW4MaYqaFNAMCiS3hsh0y3VHbD+OuRtstOFSfc/jpkIp3cyIzRHQFRsTHTqMNVRciMCAwEAAaN/MH0wHQYDVR0OBBYEFDSr+W/AcL5UrEqqdXP8AcgJyxY5ME4GA1UdIwRHMEWAFDSr+W/AcL5UrEqqdXP8AcgJyxY5oSKkIDAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlggkA3YZhcRIYEWkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEGMBD9o1WlbAvpjV7Z3b8CYLnMRwTvSBLTK5XXi+M2cf6i1Bg3khaI6V8Im7bLkHybf9k0LH0ZPgaKP0hbUCFw=
-                    </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-18.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-                                   
-        <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://nya-18.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-        
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-18.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-18.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-        
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-18.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-    </IDPSSODescriptor>
-
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
-        <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-        </Extensions>
-
-        <KeyDescriptor>
-            <ds:KeyInfo>
-                <ds:X509Data>
-                    <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAN2GYXESGBFpMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDEyWhcNMjEwMjA4MDYzMDEyWjAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMFjOGScAuxeZLjNtwUA+iW4MaYqaFNAMCiS3hsh0y3VHbD+OuRtstOFSfc/jpkIp3cyIzRHQFRsTHTqMNVRciMCAwEAAaN/MH0wHQYDVR0OBBYEFDSr+W/AcL5UrEqqdXP8AcgJyxY5ME4GA1UdIwRHMEWAFDSr+W/AcL5UrEqqdXP8AcgJyxY5oSKkIDAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlggkA3YZhcRIYEWkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEGMBD9o1WlbAvpjV7Z3b8CYLnMRwTvSBLTK5XXi+M2cf6i1Bg3khaI6V8Im7bLkHybf9k0LH0ZPgaKP0hbUCFw=
-                    </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-18.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-        
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-        
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-        
-    </AttributeAuthorityDescriptor>
-    
-</EntityDescriptor>
diff --git a/nya-1.0/nya-19.ladok.umu.se-aws-sp.xml b/nya-1.0/nya-19.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index e430cd78..00000000
--- a/nya-1.0/nya-19.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-19.ladok.umu.se/aws-sp">
-
-  <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:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-19.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-19.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-19.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMWAUMzkvTL3MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xOS5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDE0WhcNMjEwMjA4
-MDYzMDE0WjAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyJyTJK4mJmZIrsWrrV1SUBIOcEQoOHus
-XZWBG2idtbYpJo/l1k0RRb8RQ+ex3p/JEPJi8P/nUA7I4hCspjD6Ms8YB3Bo2/ms
-Xzo3cRiLU1/2UwmgRxdqG/gD83ZRPUsUblwPahtyp8WrzUGmqE+9vparnnNcG0RR
-xavuyp4fPsjFPwjaFVxYTNJubOJksPGnQTxCuMJgM+LUFV11O05KUTzmSV/QZ7Km
-p1jM87iTO0HLp9GegHbGEU5OQ6LHIDzohsKqLgWTVsbJuNpv8buBg45yUe3mMPiz
-m0OGxbNLGRHvkjUiLO9xVu2nuwcDvuaenlFNJIKQjkXJ4+sCdM21rwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTkubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-OS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRJnt+aPsW742I4MZZzRsKO
-lqj0tTANBgkqhkiG9w0BAQUFAAOCAQEArvtdazgSyEnp5NSUetJw0ZqukY49OWD7
-pACxzvG3nBJXR4ZnbnzsJganSdYpOoeaYEddRfaOmLtJIhMoXjO8kmU4OjysoOit
-iNEjB1K94+6xwdG7k/UNsIgWOKfGUWvkBL2sFxIXxKrVDLrg1We5cEyfXbLuKmu7
-bfbOWpDhH8G25Eq2sGRry/VvGzRJgjJh6O3J57ZChdKahFUG/oCll4X/9gH/NfYy
-b2/XMG9zMk9vvk3xo7u8kwcojJ4lrmTH3yu8Idke5ynjDiebCk2xMJDiCpoQh1cl
-MF2VuHyKURhfDXExoxAgxbRq40OLq+ihxU9YPZucKRAylY1Mydq0bA==
-</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>https://nya-19.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-19.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-19.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMWAUMzkvTL3MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xOS5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDE0WhcNMjEwMjA4
-MDYzMDE0WjAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyJyTJK4mJmZIrsWrrV1SUBIOcEQoOHus
-XZWBG2idtbYpJo/l1k0RRb8RQ+ex3p/JEPJi8P/nUA7I4hCspjD6Ms8YB3Bo2/ms
-Xzo3cRiLU1/2UwmgRxdqG/gD83ZRPUsUblwPahtyp8WrzUGmqE+9vparnnNcG0RR
-xavuyp4fPsjFPwjaFVxYTNJubOJksPGnQTxCuMJgM+LUFV11O05KUTzmSV/QZ7Km
-p1jM87iTO0HLp9GegHbGEU5OQ6LHIDzohsKqLgWTVsbJuNpv8buBg45yUe3mMPiz
-m0OGxbNLGRHvkjUiLO9xVu2nuwcDvuaenlFNJIKQjkXJ4+sCdM21rwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTkubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-OS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRJnt+aPsW742I4MZZzRsKO
-lqj0tTANBgkqhkiG9w0BAQUFAAOCAQEArvtdazgSyEnp5NSUetJw0ZqukY49OWD7
-pACxzvG3nBJXR4ZnbnzsJganSdYpOoeaYEddRfaOmLtJIhMoXjO8kmU4OjysoOit
-iNEjB1K94+6xwdG7k/UNsIgWOKfGUWvkBL2sFxIXxKrVDLrg1We5cEyfXbLuKmu7
-bfbOWpDhH8G25Eq2sGRry/VvGzRJgjJh6O3J57ZChdKahFUG/oCll4X/9gH/NfYy
-b2/XMG9zMk9vvk3xo7u8kwcojJ4lrmTH3yu8Idke5ynjDiebCk2xMJDiCpoQh1cl
-MF2VuHyKURhfDXExoxAgxbRq40OLq+ihxU9YPZucKRAylY1Mydq0bA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
diff --git a/nya-1.0/nya-19.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-19.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 3ecc9af6..00000000
--- a/nya-1.0/nya-19.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-19.ladok.umu.se/dw-idp">
-
-    <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
-        <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-        </Extensions>
-
-        <KeyDescriptor>
-            <ds:KeyInfo>
-                <ds:X509Data>
-                    <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJALoZqg5oH9WIMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOS5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDE1WhcNMjEwMjA4MDYzMDE1WjAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMjS5smDRRSKme3FVkYJBNvBv8WgLL45en+w2avccmTbl/5bS7z7UMxKRSQwg9KpUZRgufBHQt3nk4UBRuU0xZ0CAwEAAaN/MH0wHQYDVR0OBBYEFOcur2rrM9KrBYmMrMXw59E049vPME4GA1UdIwRHMEWAFOcur2rrM9KrBYmMrMXw59E049vPoSKkIDAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlggkAuhmqDmgf1YgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKyHV9zDBrCE7bBU1adiJ2900BoITYW8NL34xCPuMxXPHsGFI39dUC2wqAdmDFD6QZecaEqdFROTR27IY7wAtmk=
-                    </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-19.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-                                   
-        <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://nya-19.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-        
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-19.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-        
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-19.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-    </IDPSSODescriptor>
-
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
-        <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-        </Extensions>
-
-        <KeyDescriptor>
-            <ds:KeyInfo>
-                <ds:X509Data>
-                    <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJALoZqg5oH9WIMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOS5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDE1WhcNMjEwMjA4MDYzMDE1WjAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMjS5smDRRSKme3FVkYJBNvBv8WgLL45en+w2avccmTbl/5bS7z7UMxKRSQwg9KpUZRgufBHQt3nk4UBRuU0xZ0CAwEAAaN/MH0wHQYDVR0OBBYEFOcur2rrM9KrBYmMrMXw59E049vPME4GA1UdIwRHMEWAFOcur2rrM9KrBYmMrMXw59E049vPoSKkIDAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlggkAuhmqDmgf1YgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKyHV9zDBrCE7bBU1adiJ2900BoITYW8NL34xCPuMxXPHsGFI39dUC2wqAdmDFD6QZecaEqdFROTR27IY7wAtmk=
-                    </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-19.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-        
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-        
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-        
-    </AttributeAuthorityDescriptor>
-    
-</EntityDescriptor>
diff --git a/nya-1.0/nya-19.ladok.umu.se-ecs-sp.xml b/nya-1.0/nya-19.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index b19c9a1f..00000000
--- a/nya-1.0/nya-19.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-19.ladok.umu.se/ecs-sp">
-
-  <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:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-19.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-19.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-19.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIDWO/6B6u57MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xOS5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDE0WhcNMjEwMjA4
-MDYzMDE0WjAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3DJr7QcgRpXhmvJEU7MXQzUbneHaepZ/
-1TBOjSKJx55cGLKiw75RfMLla/mEp4FUUArB7oUCUzr7h46/icFLO04JSWj/QGCS
-v938sBcb4ptvErYg5/OkFoGtprX0Frc3xUDjgPHLynIl/avZt4gSEgawg2mBCcXx
-PNah6oEFofX5TuwV5iWvS4xY4wv+E/PcK2wzXVjFnFPWwkR3dTZ6qy31/54na8kL
-f9OAc5nSs9Z/Z9Gf/r5ScTPTKFe9l8J1wOy3HCw9NTzrtMNxBS8En4syqBMmrL8g
-gns1mkI7Zd7JJC+NgyCBrT7BEuA7/tWTXeCZzzscqYhzV5EDpMjVHQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTkubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-OS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQB+2r7gWrBIhYpquUK1s8X
-72GGVDANBgkqhkiG9w0BAQUFAAOCAQEAVkYPmsdJY5AAR4ajBmCXhvk11Z7GRVnR
-E4yInboU0ZnBsR7cRY1/jleHmvkbOgaqWHAbnRCayHAszf4TDyqHcZLyp1v6zJ3T
-YdE+K7KNLQLhFsRQ6KWxawzxeaj88rN7QPP84db0V03M6w9gGvyZd3Brap2KCSCF
-Tly3nfEm6uWES0FuTJw5SIxfWDt0x3mvB9gDJdRjvBErGu5da/wrWfgQgY89aZq+
-MpGfOeGpoYdbwNxX+Bq/VuJB6YDCuvr68QnWqcLckCL33y0NZoGuTPoyq5eHpeda
-ER8Sto215PlOqQD1NUyzztZjub+spTzXkUffuJJTqFvoNl8BW8EoiA==
-</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>https://nya-19.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-19.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-19.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIDWO/6B6u57MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xOS5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDE0WhcNMjEwMjA4
-MDYzMDE0WjAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3DJr7QcgRpXhmvJEU7MXQzUbneHaepZ/
-1TBOjSKJx55cGLKiw75RfMLla/mEp4FUUArB7oUCUzr7h46/icFLO04JSWj/QGCS
-v938sBcb4ptvErYg5/OkFoGtprX0Frc3xUDjgPHLynIl/avZt4gSEgawg2mBCcXx
-PNah6oEFofX5TuwV5iWvS4xY4wv+E/PcK2wzXVjFnFPWwkR3dTZ6qy31/54na8kL
-f9OAc5nSs9Z/Z9Gf/r5ScTPTKFe9l8J1wOy3HCw9NTzrtMNxBS8En4syqBMmrL8g
-gns1mkI7Zd7JJC+NgyCBrT7BEuA7/tWTXeCZzzscqYhzV5EDpMjVHQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTkubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-OS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQB+2r7gWrBIhYpquUK1s8X
-72GGVDANBgkqhkiG9w0BAQUFAAOCAQEAVkYPmsdJY5AAR4ajBmCXhvk11Z7GRVnR
-E4yInboU0ZnBsR7cRY1/jleHmvkbOgaqWHAbnRCayHAszf4TDyqHcZLyp1v6zJ3T
-YdE+K7KNLQLhFsRQ6KWxawzxeaj88rN7QPP84db0V03M6w9gGvyZd3Brap2KCSCF
-Tly3nfEm6uWES0FuTJw5SIxfWDt0x3mvB9gDJdRjvBErGu5da/wrWfgQgY89aZq+
-MpGfOeGpoYdbwNxX+Bq/VuJB6YDCuvr68QnWqcLckCL33y0NZoGuTPoyq5eHpeda
-ER8Sto215PlOqQD1NUyzztZjub+spTzXkUffuJJTqFvoNl8BW8EoiA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
diff --git a/nya-1.0/nya-19.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nya-19.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 7360a057..00000000
--- a/nya-1.0/nya-19.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-19.ladok.umu.se/shibboleth-idp">
-
-    <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
-        <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-        </Extensions>
-
-        <KeyDescriptor>
-            <ds:KeyInfo>
-                <ds:X509Data>
-                    <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJANS0SB5XubXhMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOS5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDIxWhcNMjEwMjA4MDYzMDIxWjAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANk/P/fAZxYHeI2ScnuKYrlUEj3g+nkwdbSznbiwMHnktULGgBfRZS5eeV7ZzqXtPsjj2PrsMK61qiK4mfdKza8CAwEAAaN/MH0wHQYDVR0OBBYEFL/snbAG7ispUg7JVMxrAFR/i7JIME4GA1UdIwRHMEWAFL/snbAG7ispUg7JVMxrAFR/i7JIoSKkIDAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlggkA1LRIHle5teEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAH6DxY3zEo4XyWbdhL6F/D5MYS8uggq6b3GhKzXKO89J8gVSzTgC5q192t3VM08SP0GUGiLC4Vya4RgDB+QPr6o=
-                    </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-19.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-                                   
-        <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://nya-19.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-        
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-19.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-        
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-19.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-    </IDPSSODescriptor>
-
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
-        <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-        </Extensions>
-
-        <KeyDescriptor>
-            <ds:KeyInfo>
-                <ds:X509Data>
-                    <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJANS0SB5XubXhMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOS5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDIxWhcNMjEwMjA4MDYzMDIxWjAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANk/P/fAZxYHeI2ScnuKYrlUEj3g+nkwdbSznbiwMHnktULGgBfRZS5eeV7ZzqXtPsjj2PrsMK61qiK4mfdKza8CAwEAAaN/MH0wHQYDVR0OBBYEFL/snbAG7ispUg7JVMxrAFR/i7JIME4GA1UdIwRHMEWAFL/snbAG7ispUg7JVMxrAFR/i7JIoSKkIDAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlggkA1LRIHle5teEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAH6DxY3zEo4XyWbdhL6F/D5MYS8uggq6b3GhKzXKO89J8gVSzTgC5q192t3VM08SP0GUGiLC4Vya4RgDB+QPr6o=
-                    </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-19.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-        
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-        
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-        
-    </AttributeAuthorityDescriptor>
-    
-</EntityDescriptor>
diff --git a/nya-1.0/nya-20.ladok.umu.se-aws-sp.xml b/nya-1.0/nya-20.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 712d56e6..00000000
--- a/nya-1.0/nya-20.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-20.ladok.umu.se/aws-sp">
-
-  <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:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-20.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-20.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-20.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAKpnq/GoAGJ/MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yMC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDIyWhcNMjEwMjA4
-MDYzMDIyWjAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArDD2p6kR0pYxnbzsPJWq273fxk4nnUHu
-o9pTFJ8olIN2W9D+/0DBkifWfut0XMUQTke4NxXVX3LvEMAJgX79AAZ3lI3zf1OK
-d7gP2DKidxoZupqiocWOML2EGww7MD9VU7DurCuH7p3bl3HC278KvCP3LBtMUqOt
-CO8n8y5cMmp0Q2ErslmB78AGhII47P93baoRv61XE77Wb8e+fOrRLyuIiTqv/qZT
-x9V38kK4sxYAbLMoOWbwOP62xLgHXz3Fcq5mTHYzDUv8wRJpI45AMNAL4X/6aK9S
-EgHWD96fcwdQHdZD292gHdeXLqWzKNk/CjQ4kKx10+fEuZGZQgjqxwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjAubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-MC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQCIEpbDyhGybIbV0kknwJH
-BC0kxDANBgkqhkiG9w0BAQUFAAOCAQEAR6R+uQ8NdX5uanLv2Br7MKXtxB5FuIwn
-xpuc9PQIanHNJrkK+lrmuYOmbl3bfRNXUpXPsZHFg/5nsVivUmTPTKNQcL5p7yHv
-Cl+IJju/EZKE/8hPBEi22TOpRckGnjq/irEnSfHmdAM0sjy1lbOPVvMkRqwb4MDG
-ZVsCCiWm44WVgZRi/uNdC26xsKtb5LvG5ynpf3L0c1Tzb5aVfLVYmnIdf4YJxd9u
-au2vZNfZQgtLdtcm/CrfG77LQIVwwhX9xF+MA38+u2Zr2w+AqKRM24CPq1nwyKlt
-DYshArlN0SyQfXRlAJwlcfND5e3Y6n/Sqn8ttD7we8StRgkIgHKK4A==
-</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>https://nya-20.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-20.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-20.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAKpnq/GoAGJ/MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yMC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDIyWhcNMjEwMjA4
-MDYzMDIyWjAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArDD2p6kR0pYxnbzsPJWq273fxk4nnUHu
-o9pTFJ8olIN2W9D+/0DBkifWfut0XMUQTke4NxXVX3LvEMAJgX79AAZ3lI3zf1OK
-d7gP2DKidxoZupqiocWOML2EGww7MD9VU7DurCuH7p3bl3HC278KvCP3LBtMUqOt
-CO8n8y5cMmp0Q2ErslmB78AGhII47P93baoRv61XE77Wb8e+fOrRLyuIiTqv/qZT
-x9V38kK4sxYAbLMoOWbwOP62xLgHXz3Fcq5mTHYzDUv8wRJpI45AMNAL4X/6aK9S
-EgHWD96fcwdQHdZD292gHdeXLqWzKNk/CjQ4kKx10+fEuZGZQgjqxwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjAubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-MC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQCIEpbDyhGybIbV0kknwJH
-BC0kxDANBgkqhkiG9w0BAQUFAAOCAQEAR6R+uQ8NdX5uanLv2Br7MKXtxB5FuIwn
-xpuc9PQIanHNJrkK+lrmuYOmbl3bfRNXUpXPsZHFg/5nsVivUmTPTKNQcL5p7yHv
-Cl+IJju/EZKE/8hPBEi22TOpRckGnjq/irEnSfHmdAM0sjy1lbOPVvMkRqwb4MDG
-ZVsCCiWm44WVgZRi/uNdC26xsKtb5LvG5ynpf3L0c1Tzb5aVfLVYmnIdf4YJxd9u
-au2vZNfZQgtLdtcm/CrfG77LQIVwwhX9xF+MA38+u2Zr2w+AqKRM24CPq1nwyKlt
-DYshArlN0SyQfXRlAJwlcfND5e3Y6n/Sqn8ttD7we8StRgkIgHKK4A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
diff --git a/nya-1.0/nya-20.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-20.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 41eba6c3..00000000
--- a/nya-1.0/nya-20.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-20.ladok.umu.se/dw-idp">
-
-    <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
-        <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-        </Extensions>
-
-        <KeyDescriptor>
-            <ds:KeyInfo>
-                <ds:X509Data>
-                    <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJANK+8BZKocpZMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDI0WhcNMjEwMjA4MDYzMDI0WjAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMiVUdeq9QLM2jh2jbHU7ERl1ssgOGLReW7fR/yNuMjY/dF7LDi6/PViSp65T4Q1fsw5OEdy9NWVIvUlRtPnTtMCAwEAAaN/MH0wHQYDVR0OBBYEFCiungw0fQomoVTdsSXCmnTbbW3pME4GA1UdIwRHMEWAFCiungw0fQomoVTdsSXCmnTbbW3poSKkIDAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlggkA0r7wFkqhylkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAF1UvW7cvFqrryh7L9zemHqVYbjY7Dke8k7WfTaQaKEcNlYltDFj9gtltSEvr6VYRDFsOkpizCxBFVrPBuA2JgI=
-                    </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-20.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-                                   
-        <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://nya-20.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-        
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-20.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-20.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-        
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-20.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-    </IDPSSODescriptor>
-
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
-        <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-        </Extensions>
-
-        <KeyDescriptor>
-            <ds:KeyInfo>
-                <ds:X509Data>
-                    <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJANK+8BZKocpZMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDI0WhcNMjEwMjA4MDYzMDI0WjAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMiVUdeq9QLM2jh2jbHU7ERl1ssgOGLReW7fR/yNuMjY/dF7LDi6/PViSp65T4Q1fsw5OEdy9NWVIvUlRtPnTtMCAwEAAaN/MH0wHQYDVR0OBBYEFCiungw0fQomoVTdsSXCmnTbbW3pME4GA1UdIwRHMEWAFCiungw0fQomoVTdsSXCmnTbbW3poSKkIDAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlggkA0r7wFkqhylkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAF1UvW7cvFqrryh7L9zemHqVYbjY7Dke8k7WfTaQaKEcNlYltDFj9gtltSEvr6VYRDFsOkpizCxBFVrPBuA2JgI=
-                    </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-20.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-        
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-        
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-        
-    </AttributeAuthorityDescriptor>
-    
-</EntityDescriptor>
diff --git a/nya-1.0/nya-20.ladok.umu.se-ecs-sp.xml b/nya-1.0/nya-20.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index aa17b280..00000000
--- a/nya-1.0/nya-20.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-20.ladok.umu.se/ecs-sp">
-
-  <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:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-20.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-20.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-20.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJ2nk4XWTmn1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yMC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDI0WhcNMjEwMjA4
-MDYzMDI0WjAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8pLu2n6wDBw+3YzOsX7f9ue07z1oesWK
-WLQIG28pNuweFDsfhRZtzrSe/3r0Ong82J/t6ElnA1rr731Ko3sqHbMWMqCd14eA
-px6YVukOWA4xs8sPXPM3PHR6f9gnmyvSm7KW+gLqhQgIx3ioPQGgzkcLZDM0pI9m
-t0KerV7zwoRlNVsUn4oky1gsidDLPuLn3GWKyoXzcUK4x5LCfx4S18PSwW/OAerX
-5YbcI4b79RD9Ykr1cGtZZAb85vCRtcIfp+d4zm6hm1yVTGuItgpA8ZX18rxvUXgT
-10q8/GtmDf3tVYGXDdKZ3Tr4De8uYwRhaqjCrbm/blGtkK3utdJcrwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjAubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-MC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBTnXAgZ+ObomUUo/1YKrNLy
-tGbA5DANBgkqhkiG9w0BAQUFAAOCAQEA2BQwjPjXYQRGXzaom2OYLAXZNBRPmr99
-Toyrpjuwp8SdDJk7Zw7kslGw+edjoB4RnbvLPpvPUxMSKLUKM9kCD3qY5MFg82p9
-rp3Qv+CAeNCWJnzok9IvuRXKLy0MUCMnrN53pqe0Sp9jxO2vyrhp+qCdKOFFb1Mk
-FRjcMlkpr42qhRIPGRa+JHr4WrGEeKnJ3O4ihESU4yc86HpHXCnHxyR3skwtUib9
-yCbdSne4A51XdcJlkgt0sNtDGt5WM0Q/9YxgPeYp6Ja5jeNobUyW4V18DNf3NlYq
-DOSyzgIFEpaeLyD5DnxZg0kXivNtZUkwoEAm28f1c23IGkR56qggbA==
-</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>https://nya-20.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-20.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-20.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJ2nk4XWTmn1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yMC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDI0WhcNMjEwMjA4
-MDYzMDI0WjAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8pLu2n6wDBw+3YzOsX7f9ue07z1oesWK
-WLQIG28pNuweFDsfhRZtzrSe/3r0Ong82J/t6ElnA1rr731Ko3sqHbMWMqCd14eA
-px6YVukOWA4xs8sPXPM3PHR6f9gnmyvSm7KW+gLqhQgIx3ioPQGgzkcLZDM0pI9m
-t0KerV7zwoRlNVsUn4oky1gsidDLPuLn3GWKyoXzcUK4x5LCfx4S18PSwW/OAerX
-5YbcI4b79RD9Ykr1cGtZZAb85vCRtcIfp+d4zm6hm1yVTGuItgpA8ZX18rxvUXgT
-10q8/GtmDf3tVYGXDdKZ3Tr4De8uYwRhaqjCrbm/blGtkK3utdJcrwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjAubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-MC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBTnXAgZ+ObomUUo/1YKrNLy
-tGbA5DANBgkqhkiG9w0BAQUFAAOCAQEA2BQwjPjXYQRGXzaom2OYLAXZNBRPmr99
-Toyrpjuwp8SdDJk7Zw7kslGw+edjoB4RnbvLPpvPUxMSKLUKM9kCD3qY5MFg82p9
-rp3Qv+CAeNCWJnzok9IvuRXKLy0MUCMnrN53pqe0Sp9jxO2vyrhp+qCdKOFFb1Mk
-FRjcMlkpr42qhRIPGRa+JHr4WrGEeKnJ3O4ihESU4yc86HpHXCnHxyR3skwtUib9
-yCbdSne4A51XdcJlkgt0sNtDGt5WM0Q/9YxgPeYp6Ja5jeNobUyW4V18DNf3NlYq
-DOSyzgIFEpaeLyD5DnxZg0kXivNtZUkwoEAm28f1c23IGkR56qggbA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
diff --git a/nya-1.0/nya-20.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nya-20.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 1306ce15..00000000
--- a/nya-1.0/nya-20.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-20.ladok.umu.se/shibboleth-idp">
-
-    <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
-        <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-        </Extensions>
-
-        <KeyDescriptor>
-            <ds:KeyInfo>
-                <ds:X509Data>
-                    <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJALkatDGZh/ArMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDI1WhcNMjEwMjA4MDYzMDI1WjAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMV5yYE7pHl+mhfL2AUI3QMIg2gmaQ/44tTxIaWDtQg9z8UeN8ibluUfEc6lkIA+jbNA1xnMLakYBrZN33kXxrMCAwEAAaN/MH0wHQYDVR0OBBYEFGjiIrBajrSw7efSkaJcGjUGXTXUME4GA1UdIwRHMEWAFGjiIrBajrSw7efSkaJcGjUGXTXUoSKkIDAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlggkAuRq0MZmH8CswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHpIf59NfX6x02q/ztorkloPQl27yXwnDUEDMn/zDE8+Wszjz3HrrrZD33AHsvNyqF2trnC4VyPKaIyCtCkt7Z8=
-                    </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-20.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-                                   
-        <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://nya-20.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-        
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-20.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-20.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-        
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-20.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-    </IDPSSODescriptor>
-
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
-        <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-        </Extensions>
-
-        <KeyDescriptor>
-            <ds:KeyInfo>
-                <ds:X509Data>
-                    <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJALkatDGZh/ArMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDI1WhcNMjEwMjA4MDYzMDI1WjAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMV5yYE7pHl+mhfL2AUI3QMIg2gmaQ/44tTxIaWDtQg9z8UeN8ibluUfEc6lkIA+jbNA1xnMLakYBrZN33kXxrMCAwEAAaN/MH0wHQYDVR0OBBYEFGjiIrBajrSw7efSkaJcGjUGXTXUME4GA1UdIwRHMEWAFGjiIrBajrSw7efSkaJcGjUGXTXUoSKkIDAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlggkAuRq0MZmH8CswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHpIf59NfX6x02q/ztorkloPQl27yXwnDUEDMn/zDE8+Wszjz3HrrrZD33AHsvNyqF2trnC4VyPKaIyCtCkt7Z8=
-                    </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-20.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-        
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-        
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-        
-    </AttributeAuthorityDescriptor>
-    
-</EntityDescriptor>
author	Johan Berggren <jbn@nordu.net>	2011-02-14 13:00:31 +0100
committer	Johan Berggren <jbn@nordu.net>	2011-02-14 13:00:31 +0100
commit	40328ae2f1cd11d7f48092625cefc3bec52dc83f (patch)
tree	e421c3c3939d485bc7d1e8586a00753c0dfed503 /nya-1.0
parent	8dde092fb4aa6b14f48939ec5afb34d704d86115 (diff)