From 8da40357bf9eaddeb0e945dd1210a15deb1c1642 Mon Sep 17 00:00:00 2001
From: Fredrik Domeij <fredrik.domeij@umu.se>
Date: Tue, 28 Mar 2017 19:24:24 +0200
Subject: etenta.math.su.se renamed to etenta.math.su.se-shibboleth.xml

---
 swamid-2.0/etenta.math.su.se                | 87 -----------------------------
 swamid-2.0/etenta.math.su.se-shibboleth.xml | 84 ++++++++++++++++++++++++++++
 swamid-sp-2.0.mxml                          |  2 +-
 3 files changed, 85 insertions(+), 88 deletions(-)
 delete mode 100644 swamid-2.0/etenta.math.su.se
 create mode 100644 swamid-2.0/etenta.math.su.se-shibboleth.xml

diff --git a/swamid-2.0/etenta.math.su.se b/swamid-2.0/etenta.math.su.se
deleted file mode 100644
index a41395a4..00000000
--- a/swamid-2.0/etenta.math.su.se
+++ /dev/null
@@ -1,87 +0,0 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://etenta.math.su.se/shibboleth">
-
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>etenta.math.su.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=etenta.math.su.se,O=Stockholms universitet,C=SE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEcDCCA1igAwIBAgIQPeuEmtzAXHUS0vug+BLA6TANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMDExNTAwMDAwMFoXDTEzMDExNDIzNTk1OVowSjELMAkGA1UE
-BhMCU0UxHzAdBgNVBAoTFlN0b2NraG9sbXMgdW5pdmVyc2l0ZXQxGjAYBgNVBAMT
-EWV0ZW50YS5tYXRoLnN1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAqTegRf6kffNbA8D4Lrij26Zu81qPigIokEhLdZrGsx5DEH5jsmoIrhoEZshV
-vBGwIJIA/IoxRZFEjcTWvaJcYG01oSr3/XBKeYjEVRSX3KxbcU5Dd2qN5YnvyxoW
-oldlTmU22TuOovup0UjkKpQ7VPzgcMU3gQ6Cx0oUHJ0KAgI6yCMooX/cR0CCjfZ6
-XTPTqtnoSYr+j2ZWGNcHUBd0AFXu6fNBxmpy/HTNY+UVeaWF5shrg2tginZkQQ2m
-1R/RFiNxC5JPv5IBrZ8YkkvLOz7rQAkVCnXAVl7bp75qpxQ3R9mAJV4KpcFHY04e
-7plxQY1ISBvoqNPJkOIhDr/sdwIDAQABo4IBZDCCAWAwHwYDVR0jBBgwFoAUDL2T
-aAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFEEgsYJkGCGrGtB3mPmAQMXlCOru
-MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
-BwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQz
-MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-Y3NwLnRjcy50ZXJlbmEub3JnMBwGA1UdEQQVMBOCEWV0ZW50YS5tYXRoLnN1LnNl
-MA0GCSqGSIb3DQEBBQUAA4IBAQBSD+s+1zbkDWniGmAo0iqclGzJQU6UKqmZuIF/
-0dOT5vZ6XyyZfhRqVVAew9m+E7IUg9iZcpKF4XtL1awUR+3tAyFJs05WWX0dcIFk
-qgvOsb54NBLDwdmM1f0B5yedJVZ6VFf3pqig17V25phElY/ArJe4XyqOS0JnXrd5
-UayFwWyOsjbZ5W0YhKAi8CCOdjQkz01Es3PCo6c0AL3uKOUNvVVmF8Jrku6DPzT2
-m27FphoUCoQa8mZRcxd4h/fmEhQMg2ZTVbLz+jwjI865pueFODIgf/8IAfiTDM6y
-vC40Zznf98QP1QaaAJ1B90WydJegGcz28vmrn1SEIIlOtTic
-</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>etenta.math.su.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=etenta.math.su.se,O=Stockholms universitet,C=SE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEcDCCA1igAwIBAgIQPeuEmtzAXHUS0vug+BLA6TANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMDExNTAwMDAwMFoXDTEzMDExNDIzNTk1OVowSjELMAkGA1UE
-BhMCU0UxHzAdBgNVBAoTFlN0b2NraG9sbXMgdW5pdmVyc2l0ZXQxGjAYBgNVBAMT
-EWV0ZW50YS5tYXRoLnN1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAqTegRf6kffNbA8D4Lrij26Zu81qPigIokEhLdZrGsx5DEH5jsmoIrhoEZshV
-vBGwIJIA/IoxRZFEjcTWvaJcYG01oSr3/XBKeYjEVRSX3KxbcU5Dd2qN5YnvyxoW
-oldlTmU22TuOovup0UjkKpQ7VPzgcMU3gQ6Cx0oUHJ0KAgI6yCMooX/cR0CCjfZ6
-XTPTqtnoSYr+j2ZWGNcHUBd0AFXu6fNBxmpy/HTNY+UVeaWF5shrg2tginZkQQ2m
-1R/RFiNxC5JPv5IBrZ8YkkvLOz7rQAkVCnXAVl7bp75qpxQ3R9mAJV4KpcFHY04e
-7plxQY1ISBvoqNPJkOIhDr/sdwIDAQABo4IBZDCCAWAwHwYDVR0jBBgwFoAUDL2T
-aAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFEEgsYJkGCGrGtB3mPmAQMXlCOru
-MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
-BwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQz
-MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-Y3NwLnRjcy50ZXJlbmEub3JnMBwGA1UdEQQVMBOCEWV0ZW50YS5tYXRoLnN1LnNl
-MA0GCSqGSIb3DQEBBQUAA4IBAQBSD+s+1zbkDWniGmAo0iqclGzJQU6UKqmZuIF/
-0dOT5vZ6XyyZfhRqVVAew9m+E7IUg9iZcpKF4XtL1awUR+3tAyFJs05WWX0dcIFk
-qgvOsb54NBLDwdmM1f0B5yedJVZ6VFf3pqig17V25phElY/ArJe4XyqOS0JnXrd5
-UayFwWyOsjbZ5W0YhKAi8CCOdjQkz01Es3PCo6c0AL3uKOUNvVVmF8Jrku6DPzT2
-m27FphoUCoQa8mZRcxd4h/fmEhQMg2ZTVbLz+jwjI865pueFODIgf/8IAfiTDM6y
-vC40Zznf98QP1QaaAJ1B90WydJegGcz28vmrn1SEIIlOtTic
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://etenta.math.su.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://etenta.math.su.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://etenta.math.su.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://etenta.math.su.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://etenta.math.su.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://etenta.math.su.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://etenta.math.su.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://etenta.math.su.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://etenta.math.su.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://etenta.math.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://etenta.math.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://etenta.math.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://etenta.math.su.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://etenta.math.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
\ No newline at end of file
diff --git a/swamid-2.0/etenta.math.su.se-shibboleth.xml b/swamid-2.0/etenta.math.su.se-shibboleth.xml
new file mode 100644
index 00000000..ac406efe
--- /dev/null
+++ b/swamid-2.0/etenta.math.su.se-shibboleth.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://etenta.math.su.se/shibboleth">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>etenta.math.su.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=etenta.math.su.se,O=Stockholms universitet,C=SE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEcDCCA1igAwIBAgIQPeuEmtzAXHUS0vug+BLA6TANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEwMDExNTAwMDAwMFoXDTEzMDExNDIzNTk1OVowSjELMAkGA1UE
+BhMCU0UxHzAdBgNVBAoTFlN0b2NraG9sbXMgdW5pdmVyc2l0ZXQxGjAYBgNVBAMT
+EWV0ZW50YS5tYXRoLnN1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAqTegRf6kffNbA8D4Lrij26Zu81qPigIokEhLdZrGsx5DEH5jsmoIrhoEZshV
+vBGwIJIA/IoxRZFEjcTWvaJcYG01oSr3/XBKeYjEVRSX3KxbcU5Dd2qN5YnvyxoW
+oldlTmU22TuOovup0UjkKpQ7VPzgcMU3gQ6Cx0oUHJ0KAgI6yCMooX/cR0CCjfZ6
+XTPTqtnoSYr+j2ZWGNcHUBd0AFXu6fNBxmpy/HTNY+UVeaWF5shrg2tginZkQQ2m
+1R/RFiNxC5JPv5IBrZ8YkkvLOz7rQAkVCnXAVl7bp75qpxQ3R9mAJV4KpcFHY04e
+7plxQY1ISBvoqNPJkOIhDr/sdwIDAQABo4IBZDCCAWAwHwYDVR0jBBgwFoAUDL2T
+aAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFEEgsYJkGCGrGtB3mPmAQMXlCOru
+MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
+BwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQz
+MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
+Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
+dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
+Y3NwLnRjcy50ZXJlbmEub3JnMBwGA1UdEQQVMBOCEWV0ZW50YS5tYXRoLnN1LnNl
+MA0GCSqGSIb3DQEBBQUAA4IBAQBSD+s+1zbkDWniGmAo0iqclGzJQU6UKqmZuIF/
+0dOT5vZ6XyyZfhRqVVAew9m+E7IUg9iZcpKF4XtL1awUR+3tAyFJs05WWX0dcIFk
+qgvOsb54NBLDwdmM1f0B5yedJVZ6VFf3pqig17V25phElY/ArJe4XyqOS0JnXrd5
+UayFwWyOsjbZ5W0YhKAi8CCOdjQkz01Es3PCo6c0AL3uKOUNvVVmF8Jrku6DPzT2
+m27FphoUCoQa8mZRcxd4h/fmEhQMg2ZTVbLz+jwjI865pueFODIgf/8IAfiTDM6y
+vC40Zznf98QP1QaaAJ1B90WydJegGcz28vmrn1SEIIlOtTic
+</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>etenta.math.su.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=etenta.math.su.se,O=Stockholms universitet,C=SE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEcDCCA1igAwIBAgIQPeuEmtzAXHUS0vug+BLA6TANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEwMDExNTAwMDAwMFoXDTEzMDExNDIzNTk1OVowSjELMAkGA1UE
+BhMCU0UxHzAdBgNVBAoTFlN0b2NraG9sbXMgdW5pdmVyc2l0ZXQxGjAYBgNVBAMT
+EWV0ZW50YS5tYXRoLnN1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAqTegRf6kffNbA8D4Lrij26Zu81qPigIokEhLdZrGsx5DEH5jsmoIrhoEZshV
+vBGwIJIA/IoxRZFEjcTWvaJcYG01oSr3/XBKeYjEVRSX3KxbcU5Dd2qN5YnvyxoW
+oldlTmU22TuOovup0UjkKpQ7VPzgcMU3gQ6Cx0oUHJ0KAgI6yCMooX/cR0CCjfZ6
+XTPTqtnoSYr+j2ZWGNcHUBd0AFXu6fNBxmpy/HTNY+UVeaWF5shrg2tginZkQQ2m
+1R/RFiNxC5JPv5IBrZ8YkkvLOz7rQAkVCnXAVl7bp75qpxQ3R9mAJV4KpcFHY04e
+7plxQY1ISBvoqNPJkOIhDr/sdwIDAQABo4IBZDCCAWAwHwYDVR0jBBgwFoAUDL2T
+aAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFEEgsYJkGCGrGtB3mPmAQMXlCOru
+MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
+BwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQz
+MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
+Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
+dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
+Y3NwLnRjcy50ZXJlbmEub3JnMBwGA1UdEQQVMBOCEWV0ZW50YS5tYXRoLnN1LnNl
+MA0GCSqGSIb3DQEBBQUAA4IBAQBSD+s+1zbkDWniGmAo0iqclGzJQU6UKqmZuIF/
+0dOT5vZ6XyyZfhRqVVAew9m+E7IUg9iZcpKF4XtL1awUR+3tAyFJs05WWX0dcIFk
+qgvOsb54NBLDwdmM1f0B5yedJVZ6VFf3pqig17V25phElY/ArJe4XyqOS0JnXrd5
+UayFwWyOsjbZ5W0YhKAi8CCOdjQkz01Es3PCo6c0AL3uKOUNvVVmF8Jrku6DPzT2
+m27FphoUCoQa8mZRcxd4h/fmEhQMg2ZTVbLz+jwjI865pueFODIgf/8IAfiTDM6y
+vC40Zznf98QP1QaaAJ1B90WydJegGcz28vmrn1SEIIlOtTic
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://etenta.math.su.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://etenta.math.su.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://etenta.math.su.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://etenta.math.su.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://etenta.math.su.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://etenta.math.su.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://etenta.math.su.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://etenta.math.su.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://etenta.math.su.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://etenta.math.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://etenta.math.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://etenta.math.su.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://etenta.math.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index b5490bb1..7faec840 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -103,7 +103,7 @@
   <xi:include href="swamid-2.0/kurser3.math.su.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/webwork.math.su.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/webwork2.math.su.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/etenta.math.su.se"/>
+  <xi:include href="swamid-2.0/etenta.math.su.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/connect.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/connect-test.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/converis.info-shibboleth.xml"/>
-- 
cgit v1.2.3