2 files changed, 16 insertions, 79 deletions
diff --git a/swamid-2.0/edumeta.sae.kau.se.xml b/swamid-2.0/edumeta.sae.kau.se.xml
deleted file mode 100644
index 16a62642..00000000
--- a/swamid-2.0/edumeta.sae.kau.se.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://edumeta.sae.kau.se">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</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"/>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://edumeta.sae.kau.se/Shibboleth.sso/DS/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://edumeta.sae.kau.se/Shibboleth.sso/DS/Login" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>edumeta.sae.kau.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=edumeta.sae.kau.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC/TCCAeWgAwIBAgIJAKeQQeJWZN0eMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEmVkdW1ldGEuc2FlLmthdS5zZTAeFw0xNjA3MTQwOTE3NTFaFw0yNjA3MTIw
-OTE3NTFaMB0xGzAZBgNVBAMTEmVkdW1ldGEuc2FlLmthdS5zZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBANbjMhIlUINEfLieH4dql6Wx9TPMio1AfzRA
-hRoW1RSwled9oWrEKSl0zof5WIaWB1YnTPmWfzTxTI2oNuhcJ+orZHf1YReOA62/
-DSCG+sJmblba4jt8j4o/IXtDNnMQ9Pjd302u9OP+4oTtrTTy4X0ak8GUadPJiGNk
-sgIPcRNdDoDbSZctuOemgqVUYA9CguVU55UjFFdZKbwi5pEMnY2gvqsWkxJpR1zs
-kMP0aWuNgynQW3M2XmQDW9dS5a4ADrMONzaslMnsshXXFZ8QP4aw9khmpu4km86P
-9D6xqrQRGRM/F1mO3WFWGWfiS6orJPY0Vmz0bcVErHNh+Ftek2kCAwEAAaNAMD4w
-HQYDVR0RBBYwFIISZWR1bWV0YS5zYWUua2F1LnNlMB0GA1UdDgQWBBSaylCoO5OC
-6oVFG7CZcUyFFSVJpzANBgkqhkiG9w0BAQUFAAOCAQEAqy5Vx1H6SlexaldI/POK
-E8UL6NDx6bKQ4pqyzOGd2YouBDR96trhK5KN3wcJPaEnzs4D2DCzfQ5pJC6bFCjU
-U0uEp1MWNs3WOWxwYSB67pYBZxOiXGUY9ubpJvY8uqmd0deviCV2rE2033/2oQNk
-jCrm4wsVhb3XVEgI5b+2r/Yz3eQjChWaHQuNg+gh3OL2zvge+YVQ8AsamX4L5LW7
-wDR/7XVc2u+2vDHIU3RzfMV8GZiWMalbRtljHcC/mXh8rsKFvpTWyHCVr4DHZfFE
-OLRT54JzsUQo1oPa/Q0YUOVkJuxBYGHT4Niv825LWmYB0DyW0OxS0NUptHOlXs/F
-cg==
-</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://edumeta.sae.kau.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://edumeta.sae.kau.se/Shibboleth.sso/Artifact/SOAP" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://edumeta.sae.kau.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://edumeta.sae.kau.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edumeta.sae.kau.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edumeta.sae.kau.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edumeta.sae.kau.se/Shibboleth.sso/SAML2/POST" index="1"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/kauplay.kau.se.xml b/swamid-2.0/kauplay.kau.se.xml
index e784d4ef..9f684e48 100644
--- a/swamid-2.0/kauplay.kau.se.xml
+++ b/swamid-2.0/kauplay.kau.se.xml
@@ -17,7 +17,7 @@
         <mdui:DisplayName xml:lang="en">Kau play</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Detta är Karlstads universitets play tjänst</mdui:Description>
         <mdui:Description xml:lang="en">This is Karlstad University's streaming service</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://play.kau.se/Om</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://kauplay.kau.se/Om</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
@@ -39,13 +39,22 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kauplay.kau.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">KauPlay</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">KauPlay</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://kauplay.kau.se</md:OrganizationURL>
+    <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</md:OrganizationURL>
   </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:SurName>IT department</md:SurName>
+    <md:EmailAddress>mailto:2525@kau.se</md:EmailAddress>
+  </md:ContactPerson>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>NORDUnet</md:GivenName>
-    <md:SurName>SAML Admin</md:SurName>
-    <md:EmailAddress>mailto:saml@media.nordu.net</md:EmailAddress>
+    <md:SurName>Kenneth Boström</md:SurName>
+    <md:EmailAddress>mailto:av@kau.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Monika Allöv Andersson</md:SurName>
+    <md:EmailAddress>mailto:av@kau.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>