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

1 files changed, 6 insertions, 6 deletions

diff --git a/swamid-2.0/play.bth.se.xml b/swamid-2.0/play.bth.se.xml
index 30a7b033..20a1dbe6 100644
--- a/swamid-2.0/play.bth.se.xml
+++ b/swamid-2.0/play.bth.se.xml
@@ -3,8 +3,7 @@
   <md:Extensions>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -20,14 +19,14 @@
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIID4TCCAsmgAwIBAgIJANYuxTUyYl49MA0GCSqGSIb3DQEBCwUAMIGGMQswCQYDVQQGEwJTRTERMA8GA1UECAwIQmxla2luZ2UxEzARBgNVBAcMCkthcmxza3JvbmExDDAKBgNVBAoMA0JUSDENMAsGA1UECwwER0lUUzEUMBIGA1UEAwwLcGxheS5idGguc2UxHDAaBgkqhkiG9w0BCQEWDXNvcC5pdEBidGguc2UwHhcNMTYwMjAzMTEyNzA2WhcNMjYwMjAyMTEyNzA2WjCBhjELMAkGA1UEBhMCU0UxETAPBgNVBAgMCEJsZWtpbmdlMRMwEQYDVQQHDApLYXJsc2tyb25hMQwwCgYDVQQKDANCVEgxDTALBgNVBAsMBEdJVFMxFDASBgNVBAMMC3BsYXkuYnRoLnNlMRwwGgYJKoZIhvcNAQkBFg1zb3AuaXRAYnRoLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArox0Yil1CwvPy2Ugw27a7H1++U5FCYpl8rMyhkaOdqANQ56R2XoP+M78Xx4Zooj0ftHBgUhx2RwgqxfEs7shZ1NlzOaItPShlu4dCmNdcUBW/sl6dmUANYPPIjONMQiEtsTajmgXP88/9yMm/BlPyvDaY9lGQz4z8FcBQa7aOZ/aYjpAGj7x5bWvJ3174JF4idwBMIuP1bkvNedxn+1Uf3umHYP1XxLeWJGt3Mgx8JC+Ve+3Qz8tuf2a5xeiGgh0U7mMUE0tX7+MXiCPsXauUHC7MU6pB7vKWk79Q3jKdmP0qv9Tty/sICv0QdfRYd1TdMyMD+FYMeVJlJSquBcpbQIDAQABo1AwTjAdBgNVHQ4EFgQUBhWDwptdljrj9Y52d9divoFLF/IwHwYDVR0jBBgwFoAUBhWDwptdljrj9Y52d9divoFLF/IwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAFSjaXmS+aPCZ3vhI5St7WbKW+zYGQudRi/G2cn6bjt4QM1zb9gEDQ+RBQs8FTGFApq2h7Lb67J9ozrIGIxGUf+Jpuc+003oCv6xwHL3tnmVgoZp2m0ZdL8SIYwQA+z7UluY08a+lNHIDDw10EPVJKtR/9k5CpwG8nlkQt7tD+nblo9xPhj00cXokQRKtAM46zWFuPwlgIVpo7r0xuXlHF4UCjyCv8LqWtw+DPzhKA3FZ5AccYTMkvzKHhCusAn010l1kFVYCc7u+p7i0vAD4Z3uoXODpxner69kowOtX/DwQm1hdn1L9aTObRxv6uyDZqUlOiRFXIWt7BXgj3Zzw9Q==</ds:X509Certificate>
+          <ds:X509Certificate>MIICMjCCAZugAwIBAgIUSNmSXuKOmQgtimtnumPU1gAM/PYwDQYJKoZIhvcNAQEFBQAwPTEpMCcGA1UEAwwgMzM3LW1lZGlhc3BhY2Uua2FsdHVyYS5ub3JkdS5uZXQxEDAOBgNVBAoMB2thbHR1cmEwHhcNMTgwNjI1MDkyMTE2WhcNMTkwNjI1MDkyMTE2WjA9MSkwJwYDVQQDDCAzMzctbWVkaWFzcGFjZS5rYWx0dXJhLm5vcmR1Lm5ldDEQMA4GA1UECgwHa2FsdHVyYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAu0jIT398Vd2YsyF9LUzYZy5eJlpo3UIdNeGOWUcLDfC6ixe6Z1DLjYHYpsld3zjAhO1+V9UuRaXAwlBf+DbOZFudtNa7gq7+Xh3zUOVb+9wIU/sw1lgi6bJ2xX7k9axM9yAUmquCYTrsP0l+OLSLh0tvKhs9RwPMkCDu90Id3qUCAwEAAaMvMC0wKwYDVR0RBCQwIoIgMzM3LW1lZGlhc3BhY2Uua2FsdHVyYS5ub3JkdS5uZXQwDQYJKoZIhvcNAQEFBQADgYEAeJ1744GzQ+UeeZZljO2yhEqBZIUXvdAQZXVGYcGEH8VVv6uXFGntgKqA8kqG5/KdlRz8wVuaAwlcnj7QEuEoWMv1V1q5laFqJApu5vguZruEoiRNUEmpGTG9LDE1w/4or4K06GqJCJePJnB5mesLHwi8KgFPXmzGu2O2Vs2x1eY=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIID4TCCAsmgAwIBAgIJANYuxTUyYl49MA0GCSqGSIb3DQEBCwUAMIGGMQswCQYDVQQGEwJTRTERMA8GA1UECAwIQmxla2luZ2UxEzARBgNVBAcMCkthcmxza3JvbmExDDAKBgNVBAoMA0JUSDENMAsGA1UECwwER0lUUzEUMBIGA1UEAwwLcGxheS5idGguc2UxHDAaBgkqhkiG9w0BCQEWDXNvcC5pdEBidGguc2UwHhcNMTYwMjAzMTEyNzA2WhcNMjYwMjAyMTEyNzA2WjCBhjELMAkGA1UEBhMCU0UxETAPBgNVBAgMCEJsZWtpbmdlMRMwEQYDVQQHDApLYXJsc2tyb25hMQwwCgYDVQQKDANCVEgxDTALBgNVBAsMBEdJVFMxFDASBgNVBAMMC3BsYXkuYnRoLnNlMRwwGgYJKoZIhvcNAQkBFg1zb3AuaXRAYnRoLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArox0Yil1CwvPy2Ugw27a7H1++U5FCYpl8rMyhkaOdqANQ56R2XoP+M78Xx4Zooj0ftHBgUhx2RwgqxfEs7shZ1NlzOaItPShlu4dCmNdcUBW/sl6dmUANYPPIjONMQiEtsTajmgXP88/9yMm/BlPyvDaY9lGQz4z8FcBQa7aOZ/aYjpAGj7x5bWvJ3174JF4idwBMIuP1bkvNedxn+1Uf3umHYP1XxLeWJGt3Mgx8JC+Ve+3Qz8tuf2a5xeiGgh0U7mMUE0tX7+MXiCPsXauUHC7MU6pB7vKWk79Q3jKdmP0qv9Tty/sICv0QdfRYd1TdMyMD+FYMeVJlJSquBcpbQIDAQABo1AwTjAdBgNVHQ4EFgQUBhWDwptdljrj9Y52d9divoFLF/IwHwYDVR0jBBgwFoAUBhWDwptdljrj9Y52d9divoFLF/IwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAFSjaXmS+aPCZ3vhI5St7WbKW+zYGQudRi/G2cn6bjt4QM1zb9gEDQ+RBQs8FTGFApq2h7Lb67J9ozrIGIxGUf+Jpuc+003oCv6xwHL3tnmVgoZp2m0ZdL8SIYwQA+z7UluY08a+lNHIDDw10EPVJKtR/9k5CpwG8nlkQt7tD+nblo9xPhj00cXokQRKtAM46zWFuPwlgIVpo7r0xuXlHF4UCjyCv8LqWtw+DPzhKA3FZ5AccYTMkvzKHhCusAn010l1kFVYCc7u+p7i0vAD4Z3uoXODpxner69kowOtX/DwQm1hdn1L9aTObRxv6uyDZqUlOiRFXIWt7BXgj3Zzw9Q==</ds:X509Certificate>
+          <ds:X509Certificate>MIICMjCCAZugAwIBAgIUSNmSXuKOmQgtimtnumPU1gAM/PYwDQYJKoZIhvcNAQEFBQAwPTEpMCcGA1UEAwwgMzM3LW1lZGlhc3BhY2Uua2FsdHVyYS5ub3JkdS5uZXQxEDAOBgNVBAoMB2thbHR1cmEwHhcNMTgwNjI1MDkyMTE2WhcNMTkwNjI1MDkyMTE2WjA9MSkwJwYDVQQDDCAzMzctbWVkaWFzcGFjZS5rYWx0dXJhLm5vcmR1Lm5ldDEQMA4GA1UECgwHa2FsdHVyYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAu0jIT398Vd2YsyF9LUzYZy5eJlpo3UIdNeGOWUcLDfC6ixe6Z1DLjYHYpsld3zjAhO1+V9UuRaXAwlBf+DbOZFudtNa7gq7+Xh3zUOVb+9wIU/sw1lgi6bJ2xX7k9axM9yAUmquCYTrsP0l+OLSLh0tvKhs9RwPMkCDu90Id3qUCAwEAAaMvMC0wKwYDVR0RBCQwIoIgMzM3LW1lZGlhc3BhY2Uua2FsdHVyYS5ub3JkdS5uZXQwDQYJKoZIhvcNAQEFBQADgYEAeJ1744GzQ+UeeZZljO2yhEqBZIUXvdAQZXVGYcGEH8VVv6uXFGntgKqA8kqG5/KdlRz8wVuaAwlcnj7QEuEoWMv1V1q5laFqJApu5vguZruEoiRNUEmpGTG9LDE1w/4or4K06GqJCJePJnB5mesLHwi8KgFPXmzGu2O2Vs2x1eY=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
@@ -41,7 +40,8 @@
     <md:OrganizationURL xml:lang="en">https://play.bth.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
-    <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
+    <md:GivenName>NORDUnet</md:GivenName>
+    <md:SurName>SAML Admin</md:SurName>
+    <md:EmailAddress>saml@media.nordu.net</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>