Merge branch 'master' of git.swamid.se:swamid-metadata

5 files changed, 129 insertions, 268 deletions

diff --git a/swamid-2.0/drive.test.sunet.se-index.php-apps-user_saml-saml-metadata.xml b/swamid-2.0/drive.test.sunet.se-index.php-apps-user_saml-saml-metadata.xml
deleted file mode 100644
index 4f9309ce..00000000
--- a/swamid-2.0/drive.test.sunet.se-index.php-apps-user_saml-saml-metadata.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://drive.test.sunet.se/index.php/apps/user_saml/saml/metadata">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-09-10T08:36:14Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">SUNET Drive (test)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">SUNET Drive (test)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Sunet Drive är en molntjänst baserad på Sunets Lagring Tjänst (Storage As A Service) samt produkten NextCloud</mdui:Description>
-        <mdui:Description xml:lang="en">Sunet Drive is a cloud service running on Sunets Storage As A Service and NextCloud</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://wiki.sunet.se/display/Drive</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://wiki.sunet.se/display/Drive</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID8zCCAtugAwIBAgIUKTUl48fwGETx9iOlCOl6MNAk7agwDQYJKoZIhvcNAQELBQAwgYgxCzAJBgNVBAYTAlNFMRowGAYDVQQIDBFTdG9ja2hvbG1zIGzDg8KkbjESMBAGA1UEBwwJU3RvY2tob2xtMQ4wDAYDVQQKDAVTdW5ldDEcMBoGA1UEAwwTZHJpdmUudGVzdC5zdW5ldC5zZTEbMBkGCSqGSIb3DQEJARYMbm9jQHN1bmV0LnNlMB4XDTIxMDkwOTEzMDkwOVoXDTIxMTAwOTEzMDkwOVowgYgxCzAJBgNVBAYTAlNFMRowGAYDVQQIDBFTdG9ja2hvbG1zIGzDg8KkbjESMBAGA1UEBwwJU3RvY2tob2xtMQ4wDAYDVQQKDAVTdW5ldDEcMBoGA1UEAwwTZHJpdmUudGVzdC5zdW5ldC5zZTEbMBkGCSqGSIb3DQEJARYMbm9jQHN1bmV0LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsuih5NHhEW+w7fMMyc75QIuzOvbGgfW7sAYC2hSs8cnsM+xa+2l+y8AgmGz3axxExJEJcMU3eDEVbrVGSUquuG/ryZqEM37yvS1man8TuA/ZG2rAekwkgSKDEM6HnWKJxOU1dTrh2PHjCq54hHni9Km3Bqmnb2V31XyipIU915GBMKnIvonD+ZmVG8e36KJ6/Knx5Sx7Wi4AxtilgNuau3ozCuYGDVqUaXKGR9PtJ9c0+wdNI4Rp9S3QLm+49W36hqffHKsvSggEUFK2fWB6TQJLrXKdq3GYAAfxkQJfUybty+gJt2eNi6+lmM8Yl+BbdSrnf1Wx65gYLFwFPSMN4QIDAQABo1MwUTAdBgNVHQ4EFgQUk4fWG3RRNLcpxATRxIVSvl0jnxEwHwYDVR0jBBgwFoAUk4fWG3RRNLcpxATRxIVSvl0jnxEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAavY02JoYbR8sHbC4T+DvC7quVsDtFUsNkQesLPrCRSB1dfaIxd9ImsevFwkq9+x+9YXVPqF+RJgApneuDgZYGh5VREDwH8+UxkwOh8FQlt3JZXoEGzwZVYAQ79p33b4TQx2qayfAnyn4PTzpL21zq848AUaOS0yJyq9PY6jOoCaAJdTeQNIZ8DIWgU2i0mCwyQtDbW0gfuOim8sG6go8SZGAU6E2QgmvzVR94Bur91rri0CkImvhsVRhiA8JloeEmqBMbJyOobjkBopQ5c0qyARjVP9gxdB3aZnhB6DI59RchN1BztjwG9FuIOcD8sVJOpUMUXseN0xyPQQ0sD4WyA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID8zCCAtugAwIBAgIUKTUl48fwGETx9iOlCOl6MNAk7agwDQYJKoZIhvcNAQELBQAwgYgxCzAJBgNVBAYTAlNFMRowGAYDVQQIDBFTdG9ja2hvbG1zIGzDg8KkbjESMBAGA1UEBwwJU3RvY2tob2xtMQ4wDAYDVQQKDAVTdW5ldDEcMBoGA1UEAwwTZHJpdmUudGVzdC5zdW5ldC5zZTEbMBkGCSqGSIb3DQEJARYMbm9jQHN1bmV0LnNlMB4XDTIxMDkwOTEzMDkwOVoXDTIxMTAwOTEzMDkwOVowgYgxCzAJBgNVBAYTAlNFMRowGAYDVQQIDBFTdG9ja2hvbG1zIGzDg8KkbjESMBAGA1UEBwwJU3RvY2tob2xtMQ4wDAYDVQQKDAVTdW5ldDEcMBoGA1UEAwwTZHJpdmUudGVzdC5zdW5ldC5zZTEbMBkGCSqGSIb3DQEJARYMbm9jQHN1bmV0LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsuih5NHhEW+w7fMMyc75QIuzOvbGgfW7sAYC2hSs8cnsM+xa+2l+y8AgmGz3axxExJEJcMU3eDEVbrVGSUquuG/ryZqEM37yvS1man8TuA/ZG2rAekwkgSKDEM6HnWKJxOU1dTrh2PHjCq54hHni9Km3Bqmnb2V31XyipIU915GBMKnIvonD+ZmVG8e36KJ6/Knx5Sx7Wi4AxtilgNuau3ozCuYGDVqUaXKGR9PtJ9c0+wdNI4Rp9S3QLm+49W36hqffHKsvSggEUFK2fWB6TQJLrXKdq3GYAAfxkQJfUybty+gJt2eNi6+lmM8Yl+BbdSrnf1Wx65gYLFwFPSMN4QIDAQABo1MwUTAdBgNVHQ4EFgQUk4fWG3RRNLcpxATRxIVSvl0jnxEwHwYDVR0jBBgwFoAUk4fWG3RRNLcpxATRxIVSvl0jnxEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAavY02JoYbR8sHbC4T+DvC7quVsDtFUsNkQesLPrCRSB1dfaIxd9ImsevFwkq9+x+9YXVPqF+RJgApneuDgZYGh5VREDwH8+UxkwOh8FQlt3JZXoEGzwZVYAQ79p33b4TQx2qayfAnyn4PTzpL21zq848AUaOS0yJyq9PY6jOoCaAJdTeQNIZ8DIWgU2i0mCwyQtDbW0gfuOim8sG6go8SZGAU6E2QgmvzVR94Bur91rri0CkImvhsVRhiA8JloeEmqBMbJyOobjkBopQ5c0qyARjVP9gxdB3aZnhB6DI59RchN1BztjwG9FuIOcD8sVJOpUMUXseN0xyPQQ0sD4WyA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drive.test.sunet.se/index.php/apps/user_saml/saml/acs" index="1"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>Richard Freitag</md:SurName>
-    <md:EmailAddress>mailto:freitag@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>SUNET</md:GivenName>
-    <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SUNET</md:GivenName>
-    <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/du-graylog.cnaas.sunet.se.xml b/swamid-2.0/du-graylog.cnaas.sunet.se.xml
new file mode 100644
index 00000000..f9706951
--- /dev/null
+++ b/swamid-2.0/du-graylog.cnaas.sunet.se.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://du-graylog.cnaas.sunet.se">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-10-11T13:41:45Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdattr:EntityAttributes>
+      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://du-graylog.cnaas.sunet.se/Shibboleth.sso/DS/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://du-graylog.cnaas.sunet.se/Shibboleth.sso/DS/Login" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">du-graylog.cnaas.sunet.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">du-graylog.cnaas.sunet.se</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">DU Graylog</mdui:Description>
+        <mdui:Description xml:lang="en">DU Graylog</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://wiki.sunet.se/display/SUNETCERT/Graylog</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/CNaaS/Transfer+of+personal+data+to+CnaaS+Graylog+when+using+federated+login</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/CNaaS/Transfer+of+personal+data+to+CnaaS+Graylog+when+using+federated+login</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="en">https://wiki.sunet.se/display/SUNETCERT/Graylog</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:KeyName>https://du-graylog.cnaas.sunet.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=https://du-graylog.cnaas.sunet.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFKjCCAxKgAwIBAgIJAPEbwzgmXcMSMA0GCSqGSIb3DQEBCwUAMCwxKjAoBgNV
+BAMTIWh0dHBzOi8vZHUtZ3JheWxvZy5jbmFhcy5zdW5ldC5zZTAeFw0yMjEwMTEx
+MDQ5MTdaFw0zMjEwMDgxMDQ5MTdaMCwxKjAoBgNVBAMTIWh0dHBzOi8vZHUtZ3Jh
+eWxvZy5jbmFhcy5zdW5ldC5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
+ggIBAL5C30+KQ5K2tyL9Ps81Rn8HgKcsthdoq43hIo+LqhjZxY0UNDPfhlrlqbFb
+9I9QDVAYm8J8EQkIwI8XPL38QKCGli6Yvr/WJe4dx6EocIxp9ojYy9acpPmUJzqN
+TOvDF/R1JIjT8bWIJpBwWD5lUd8n4k0WnxsDe4GJj1tdaDIaxprcyT9beco4Ducv
+o/AjHhxOch4go9iI2YiKqmRriROEEAC8pdKU3yvoQcV14lIvpB9r6CGgefGy4FIX
+tIQCoqn/716FeUNEs6jYkCB1/fG8L5gRn9YsaVgB4rZYYhwh5FRO1OuwvmwN/2RJ
+xBrqheVp5THOvkhEi7g+gq5KM+55nvcijmGA+Cr6nZdN7Xd1VvNP6r9Jyzo3iQAb
+OGX4Px2cMsSdFl+/4Krl03zD/m5NxFP8cHi1yJ0zxH383UgVoV+wRGka8zD00AVn
+uq5NmE4XTcup2Sz8UeSgMINs0DFGPfZM27zTon5wPDxlyhRGmcRI5PR0Dkxlo5V1
+GEWyY4Z5tYxSDOZHTqU0xxM1sHz13Jdvs3cRBMtCvex3pMLSA2iSkNrW2vz6iofD
+iXayRBWdthxJEY1lJdlimtZbKTqG7J9+SU/+Kih3+57jcYLCGiXv3pwYCkLzGkQF
+nPpTNlOEg6SAkjZXG8zvDficBaocxKRyo7LC6I+GbhPC1tMJAgMBAAGjTzBNMCwG
+A1UdEQQlMCOCIWh0dHBzOi8vZHUtZ3JheWxvZy5jbmFhcy5zdW5ldC5zZTAdBgNV
+HQ4EFgQUKG0BB7KTLfhMi9ixEYvwbelQHtIwDQYJKoZIhvcNAQELBQADggIBAHaD
+5+QHkg44AvzhuwMEAD85i0Q4OY5F/oTZ9zuaqpYf3zrjO+Z/HXbMna7aH5Da2OWT
+Nr44ofm1Tr/1dX8FKHEX/1MK6TUoinianC0uEHxyC7ykR4J/HYF+JrfHid0KNeqR
+bZ+beWEa+nVoI7XEnFSsOuqbMDn9jLjbfCdJ4rwdCgezemB2se+Rx+lt62mih1lE
+dv6oxcAj2y0IpF/k274TRVdyAeGnviQ+xWbn9X5Zsb3Lyt4qDeZ8pTsgrAXHnoEv
+AZGI9pIbdyQ858rnxxrNzXsewiribPIhrvqEIhR7dXxYnZM4EMbf3qyaRfgHTACe
+9c+7e6NddEeVEnSSCb9Vpu2aM+MS7guFUyq12EHmGLowePWtSUY+00YhU8JG0yJX
+OQw/AJ+to1dCM5bJIXm9Yj7tHh21sexjvRrOmQFv64OYCnXNF1vu4ut3Et1tcalZ
+EARd5NC/I8nF6fTeGq2GFsixGOZJRmvE8Mre7PlIq7d9WOmSkr65OvSBC88TwfBD
+4wwm0haEFVJuftAs4p9Qq2J/SbKu0LiO1r5u2OwQ27FccQxaELLG7zDDLZnV2SKu
+igl/UXk2BlGfKiasI50oWAz5x8oA5EFE0usWGHph717vxUERSVv0L2qKKLhuFDKK
+48dGtYp7qB8kYZ0mSVyHuKaJ+Fe/Mcbqe9PAJ3ts
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://du-graylog.cnaas.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://du-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://du-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://du-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://du-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://du-graylog.cnaas.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="sv">du-graylog.cnaas.sunet.se</md:ServiceName>
+      <md:ServiceName xml:lang="en">du-graylog.cnaas.sunet.se</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.sunet.se/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sunet NOC</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Sunet NOC</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Sunet NOC</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SUNET NOC</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/mittkau-stage.sai.kau.se-shibboleth.xml b/swamid-2.0/mittkau-stage.sai.kau.se-shibboleth.xml
deleted file mode 100644
index 05bcfa9b..00000000
--- a/swamid-2.0/mittkau-stage.sai.kau.se-shibboleth.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://mittkau-stage.sai.kau.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-04-06T13:14:27Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mittkau-stage.sai.kau.se/Shibboleth.sso/Login"/>
-      <mdui:UIInfo>
-        <mdui:Description xml:lang="sv">Mitt Kau är en personlig digital tjänst för dig som är student vid Karlstads universitet.</mdui:Description>
-        <mdui:Description xml:lang="en">My Kau is a personalised digital service for students at Karlstad University.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://mitt.kau.se/login/sv</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://mitt.kau.se/login/en</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://mitt.kau.se/login/policy/sv</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://mitt.kau.se/login/policy/en</mdui:PrivacyStatementURL>
-        <mdui:DisplayName xml:lang="sv">Mitt Kau (test)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Mitt Kau (test)</mdui:DisplayName>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>mittkau-stage.sai.kau.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=mittkau-stage.sai.kau.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEGjCCAoKgAwIBAgIUdZUNL2GsfWyFpbXrZ3CGimyxe7kwDQYJKoZIhvcNAQEL
-BQAwIzEhMB8GA1UEAxMYbWl0dGthdS1zdGFnZS5zYWkua2F1LnNlMB4XDTIwMDMy
-NzEyMjE0OFoXDTMwMDMyNTEyMjE0OFowIzEhMB8GA1UEAxMYbWl0dGthdS1zdGFn
-ZS5zYWkua2F1LnNlMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAs8Bc
-3HAJ6k7QsqoNxZG6m1SzKDjDd42LOHg2O6sbvgGcNspvWfLpnUW8zA3xZNsxcA2e
-/CBbLnrEi6cGOtemK3KsSkxJqAxILsTxROmdV3py6sWjX5OxVGJK19tQ58YD6Pen
-OFoPfRrh1Hnc660Nsn2cSu0Tq/vQqDcCrf2pv3wqYwLcXIFB8LTKBKb06i1Wv6K3
-Ulobu/CHhFRkFtzZqT+s/jJsuyXjhnjXBhD2JpPsmhVIx08PRFPZ6NCKbSeLtzSv
-cDOn55GFOJ8duoiLcZJYB+Ka6WEtIrYDzaJE34T46f/jc9M1TawQyXGmdqcREMjJ
-dgsDq9Lfr7035Scbfo7E08q/7da2h0mxcB/Yge5mHWwEtLgOB1h8KSz1b6y+3dXq
-cdhKHfUy8NaWeonceMcGeYUEZfMErZypdvvN8mG1Z2bs5/foMPB8YIlVrtadvOta
-JrvtiJQZjEn0usab+GMBEuoxzE/3T9zZZ8liO4L4yanKSsXDiOdChsAJKYszAgMB
-AAGjRjBEMCMGA1UdEQQcMBqCGG1pdHRrYXUtc3RhZ2Uuc2FpLmthdS5zZTAdBgNV
-HQ4EFgQU/PUDT6YmcrAR0nseSCOXl3RurpowDQYJKoZIhvcNAQELBQADggGBAI0y
-1IzkxQ48DLpLJucq70fAP3H3/Lxd6tOcjvJZOLCvWekZX9gPr9j6o0v9VlEiyseS
-AM9fVQi63aEVVCm4JEY6B7pcC/zaYRCKg3kaN9fdHCOLB7k7u/6yCZrAXqMbzIpv
-kGhfw9GwD6WPqL+oGmcUWXxeVDqHLe59vedNtKfV5E382hCSdMqrWz+gI9sQM+5H
-V3MTsV5TAN2nYZI79+4VnCmJaMJnSN6fNaRLBf0O0UWDAtOC+hGUga5p+M8jHfqY
-bxhX5LVIWz45N+jJ+NfXRgWq3GD7BsqNhnOhOHuoF1kY6wipTRdyY9foSDHH6ns6
-Lm96czxFMrbtCP4FAEXzQlX3v8Ph4W9q+x4+Z9a3w5RgEkreI/Mz3hfuJEKrVXEe
-MH2SlG4tjvp12kMG0ptstuaSbeYpKHquBSmoE8b4CtXwULysuCCvS5EDKjCxGYMn
-r5oR3PZ1N/zyDy6OeltFJzR7fMbuWay96SmHpd02qcEYYxGUdg0wiCliGU9lRw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mittkau-stage.sai.kau.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mittkau-test.kau.se/Shibboleth.sso/SAML2/POST" index="2"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Mitt Kau (test)</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Mitt Kau (test)</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Karlstad University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Karlstads universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Karlstad University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Karlstads universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.kau.se/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.kau.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:SurName>Mitt Kau</md:SurName>
-    <md:EmailAddress>mailto:mittkau@kau.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>Mitt Kau</md:SurName>
-    <md:EmailAddress>mailto:mittkau@kau.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>IT department</md:SurName>
-    <md:EmailAddress>mailto:2525@kau.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Incident Response Team, IT department</md:GivenName>
-    <md:EmailAddress>mailto:irt@kau.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/ra.se-leg.se-shibboleth.xml b/swamid-2.0/ra.se-leg.se-shibboleth.xml
deleted file mode 100644
index 837d5c93..00000000
--- a/swamid-2.0/ra.se-leg.se-shibboleth.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://ra.se-leg.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-04-17T16:03:07Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ra.se-leg.se/Shibboleth.sso/Login/eduid"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ra.se-leg.se/Shibboleth.sso/Login/sunet-siths"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ra.se-leg.se/Shibboleth.sso/DS/ndn"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ra.se-leg.se/Shibboleth.sso/DS/ndn" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>https://ra.se-leg.se/shibboleth</ds:KeyName>
-        <ds:KeyName>ra.se-leg.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ra.se-leg.se</ds:X509SubjectName>
-          <ds:X509Certificate>
-            MIIEDDCCAnSgAwIBAgIJAKj4PEYDXmGDMA0GCSqGSIb3DQEBCwUAMBcxFTATBgNV
-            BAMTDHJhLnNlLWxlZy5zZTAeFw0xODA0MDYxMTI3MDlaFw0yODA0MDYxMTI3MDla
-            MBcxFTATBgNVBAMTDHJhLnNlLWxlZy5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGP
-            ADCCAYoCggGBAPBitjY82g71TZFD2FoQny+nWi47CWCDcfwac8KY2bli6Gbv1274
-            by+g+KQPjvlf4rutKH8TCX0vLwW/Z8z3xKa1r9Jjntj91MdkXhj30+SB/NHvDdDX
-            hjodh/o52Jq4STgFelXT8rPin9wl59AzixDYSc2FhvP1wgUm8yinl8I8DbYYntuk
-            wEMg2jNpIfMD75fgZ/2OiIA07GtT2NYmidePP4Oh+6fnqm8UCdT78CAJq/68AWVn
-            Nb4gPj/xVa/B6PNQfBbcMU4HhCbheog88oVuozkeVJGdcjkxDb/m0JajD7vCxg7A
-            7vsUQEy73Xz5YkXSnbuvPSLWxw9LM3sNHPMGtiGEjXkTT0ivP8ck8q7yIng08ePL
-            I7z4DE7HAQOtegsy83Wj09svOgD9f4Zbqs9hKZCIMZPEJ4plTEBCdOkjsBSFvv+d
-            /pbTApQYgndvSQSX4DJhSpIuspBI7Jbbnom6PUfA/qcwz6OC3Ov9IpS5aQGW4A/Z
-            nO+4CM+vuuvmtwIDAQABo1swWTA4BgNVHREEMTAvggxyYS5zZS1sZWcuc2WGH2h0
-            dHBzOi8vcmEuc2UtbGVnLnNlL3NoaWJib2xldGgwHQYDVR0OBBYEFMjWjw0gad/q
-            TG1L3UlhDczozvD9MA0GCSqGSIb3DQEBCwUAA4IBgQCwC0R5ll6/7Sfj4kdsMrfh
-            AmAgwcf1IxqkjEPbhI1y5TRMLhB7Ajex1O2dClv/LcUn47gihDDeQPivWZMAOhSi
-            VZ5zvPiFDLSq0qQCr71A/tZQSMTg4Soiy2Pdq9DIsxob2DHV23irjvl6HgdMhxXp
-            FIoQ2lf9irpBLaNvOrp1js+FM4PrcAL1vMYUzcUSF01wOevaTtzL/qdQ/ISOmnEK
-            TQQgR3l0tQ1DQmLQIrp1PIlrc9pqPf4m9UR10EcFr88Tl9eyBrNHmkXBDelmEFTj
-            qGwPATq188LAtfp6xExopWG4OZo2ioiJ67ruOErNB4FXmOBI77/Q8ftWKhs+BsXE
-            4tk58laYNiye7lEJym+7UeDMdIwGsOhQaQDaQc5HAfdlUaqLCTXEoXGvH/6dEfeH
-            Rs8MaY+DpvgNti0cN9bXRD3aFqi5yC4tWiiHVpYts3442WPSNS3aXxPDgPs+aChd
-            T19tniO2NrPKbky6hf0eG9p/Z3d05JLLmxujdGeASX4=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ra.se-leg.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ra.se-leg.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ra.se-leg.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ra.se-leg.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ra.se-leg.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ra.se-leg.se/Shibboleth.sso/SAML2/POST" index="1"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 4470a7f8..87838187 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -293,7 +293,6 @@
   <xi:include href="swamid-2.0/kauplay.kau.se.xml"/>
   <xi:include href="swamid-2.0/play.ju.se.xml"/>
   <xi:include href="swamid-2.0/indico.test.uu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/ra.se-leg.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/hkrplay.hkr.se.xml"/>
   <xi:include href="swamid-2.0/app.sh.se.xml"/>
   <xi:include href="swamid-2.0/lubcat.lub.lu.se-shibboleth.xml"/>
@@ -466,7 +465,6 @@
   <xi:include href="swamid-2.0/secure.ouriginal.com.xml"/>
   <xi:include href="swamid-2.0/expert.hubbletest.antagning.se-ecs-sp.xml"/>
   <xi:include href="swamid-2.0/eu1.itslearning.com-integrations-samlmetadata-saml2v2-extensions-2.xml"/>
-  <xi:include href="swamid-2.0/mittkau-stage.sai.kau.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/mittkau.sae.kau.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/login.fd.su.se-apps-user_saml-saml-metadata.xml"/>
   <xi:include href="swamid-2.0/datalab.humlab.umu.se.xml"/>
@@ -490,7 +488,6 @@
   <xi:include href="swamid-2.0/sp.saml.staging.ebbot.app-7c00c56e-9e4a-446a-b9f5-4f9bf63d3216-metadata.xml"/>
   <xi:include href="swamid-2.0/konto.gih.se-saml2.xml"/>
   <xi:include href="swamid-2.0/visp-demo.humlab.umu.se.xml"/>
-  <xi:include href="swamid-2.0/drive.test.sunet.se-index.php-apps-user_saml-saml-metadata.xml"/>
   <xi:include href="swamid-2.0/konto.his.se.xml"/>
   <xi:include href="swamid-2.0/agate.cohorts.medsci.test.uu.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/agate.cohorts.medsci.uu.se-Shibboleth.sso.xml"/>
@@ -592,4 +589,5 @@
   <xi:include href="swamid-2.0/du-nav.cnaas.sunet.se.xml"/>
   <xi:include href="swamid-2.0/monitor.drive.sunet.se.xml"/>
   <xi:include href="swamid-2.0/monitor.drive.test.sunet.se.xml"/>
+  <xi:include href="swamid-2.0/du-graylog.cnaas.sunet.se.xml"/>
 </md:EntitiesDescriptor>