From 257fdb0723c231c62559c43c4b64dc220abae265 Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Fri, 25 May 2018 10:17:48 +0200
Subject: Back out NN hosted Kaltura completely. Back to Kaltura hosted

---
 swamid-2.0/1827881.mediaspace.kaltura.com.xml | 47 ---------------------------
 swamid-2.0/play.kau.se.xml                    | 10 +++---
 2 files changed, 5 insertions(+), 52 deletions(-)
 delete mode 100644 swamid-2.0/1827881.mediaspace.kaltura.com.xml

(limited to 'swamid-2.0')

diff --git a/swamid-2.0/1827881.mediaspace.kaltura.com.xml b/swamid-2.0/1827881.mediaspace.kaltura.com.xml
deleted file mode 100644
index 6fedbc94..00000000
--- a/swamid-2.0/1827881.mediaspace.kaltura.com.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://1827881.mediaspace.kaltura.com">
-  <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://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Kau play gammal</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Kau play old</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Detta var Karlstads universitets play tjänst</mdui:Description>
-        <mdui:Description xml:lang="en">This was Karlstad University's streaming service</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://play.kau.se/Om</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDgDCCAmgCCQCROUvZYUy6nTANBgkqhkiG9w0BAQUFADCBgTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk5ZMREwDwYDVQQHDAhOZXcgWW9yazEVMBMGA1UECgwMS2FsdHVyYSBJbmMuMRQwEgYDVQQDDAtwbGF5LmthdS5zZTElMCMGCSqGSIb3DQEJARYWc2FtbF9hZG1pbkBrYWx0dXJhLmNvbTAeFw0xNDEyMTgxMzAxMTRaFw0yNDEyMTcxMzAxMTRaMIGBMQswCQYDVQQGEwJVUzELMAkGA1UECAwCTlkxETAPBgNVBAcMCE5ldyBZb3JrMRUwEwYDVQQKDAxLYWx0dXJhIEluYy4xFDASBgNVBAMMC3BsYXkua2F1LnNlMSUwIwYJKoZIhvcNAQkBFhZzYW1sX2FkbWluQGthbHR1cmEuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0XggMy5SNVvIqdLuynaM29/WMVAh5Utt7G8nyNJUDqsQ7Zh6ghh0RThxtLnmokPjljs9Kw2aVzAMz+hrf28q+F5915a3q6loTrfm0llxYeRn21023aGxki44p6/B5/8hmQSJQC8JfaI9PcMzI5FxBo/U10waEIeGXzaCCNIofCGa2eqeSVEdhCcT8kKE10E2WZy+8avd4E421POuaJW9osnqGh8m06FtaWqB+MiiETxzxIvMVZvIoF1bSjvDlV1+V0JB0Sl0SO6yU8aGO6P60LPK+y3RkeNkamMgKoLEFnZRUYeoukbLzrXuEyMUMYVFGpe+8MnK9APT3Ti+HHc6ZQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBzixsmpkDzazpnjcFicXmJGnRepcawDfirRKOyMCBIaXBi2lX7uWlicl3nD3FXT134aNCBSxrSK1iahiWVbkP5Oc/dleytoKRGgfRWlfgPXf94JcztaHOPu6C4Q2OdF9GvoE0bGzt9uiRMFBcajfgu0Ct0qjWxWyxtW7eOOC01cXX5lXoSmL90jjIJ2qkITpsWafpe2g+EBGaR+VcpYb3i/3j2U7f8XNDMdd6mObznD3l8246bgHMq2Eghw/qKLU6I1Vom23R0oy6xBUo+CDpYVqejh6r9bvkHPVj1o6dlJtSzbruZkUOhw9yqQR7iQjaRG0TSg/DZRfM4EpsjTJUC</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDgDCCAmgCCQCROUvZYUy6nTANBgkqhkiG9w0BAQUFADCBgTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk5ZMREwDwYDVQQHDAhOZXcgWW9yazEVMBMGA1UECgwMS2FsdHVyYSBJbmMuMRQwEgYDVQQDDAtwbGF5LmthdS5zZTElMCMGCSqGSIb3DQEJARYWc2FtbF9hZG1pbkBrYWx0dXJhLmNvbTAeFw0xNDEyMTgxMzAxMTRaFw0yNDEyMTcxMzAxMTRaMIGBMQswCQYDVQQGEwJVUzELMAkGA1UECAwCTlkxETAPBgNVBAcMCE5ldyBZb3JrMRUwEwYDVQQKDAxLYWx0dXJhIEluYy4xFDASBgNVBAMMC3BsYXkua2F1LnNlMSUwIwYJKoZIhvcNAQkBFhZzYW1sX2FkbWluQGthbHR1cmEuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0XggMy5SNVvIqdLuynaM29/WMVAh5Utt7G8nyNJUDqsQ7Zh6ghh0RThxtLnmokPjljs9Kw2aVzAMz+hrf28q+F5915a3q6loTrfm0llxYeRn21023aGxki44p6/B5/8hmQSJQC8JfaI9PcMzI5FxBo/U10waEIeGXzaCCNIofCGa2eqeSVEdhCcT8kKE10E2WZy+8avd4E421POuaJW9osnqGh8m06FtaWqB+MiiETxzxIvMVZvIoF1bSjvDlV1+V0JB0Sl0SO6yU8aGO6P60LPK+y3RkeNkamMgKoLEFnZRUYeoukbLzrXuEyMUMYVFGpe+8MnK9APT3Ti+HHc6ZQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBzixsmpkDzazpnjcFicXmJGnRepcawDfirRKOyMCBIaXBi2lX7uWlicl3nD3FXT134aNCBSxrSK1iahiWVbkP5Oc/dleytoKRGgfRWlfgPXf94JcztaHOPu6C4Q2OdF9GvoE0bGzt9uiRMFBcajfgu0Ct0qjWxWyxtW7eOOC01cXX5lXoSmL90jjIJ2qkITpsWafpe2g+EBGaR+VcpYb3i/3j2U7f8XNDMdd6mObznD3l8246bgHMq2Eghw/qKLU6I1Vom23R0oy6xBUo+CDpYVqejh6r9bvkHPVj1o6dlJtSzbruZkUOhw9yqQR7iQjaRG0TSg/DZRfM4EpsjTJUC</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://1827881.mediaspace.kaltura.com/user/logout"/>
-    <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://1827881.mediaspace.kaltura.com/user/authenticate" index="0"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">KauPlay old</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">KauPlay old</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://1827881.mediaspace.kaltura.com</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>saml_admin@kaltura.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/play.kau.se.xml b/swamid-2.0/play.kau.se.xml
index c93fc6c8..c6fdaaa3 100644
--- a/swamid-2.0/play.kau.se.xml
+++ b/swamid-2.0/play.kau.se.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://play.kau.se">
   <md:Extensions>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
@@ -18,16 +18,16 @@
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
-          <ds:X509Certificate>MIICMjCCAZugAwIBAgIUJthSm5mO42eUMlr5toLKJCLgBMowDQYJKoZIhvcNAQEFBQAwPTEpMCcGA1UEAwwgMzAwLW1lZGlhc3BhY2Uua2FsdHVyYS5ub3JkdS5uZXQxEDAOBgNVBAoMB2thbHR1cmEwHhcNMTgwNDIwMTE1NTE1WhcNMTkwNDIwMTE1NTE1WjA9MSkwJwYDVQQDDCAzMDAtbWVkaWFzcGFjZS5rYWx0dXJhLm5vcmR1Lm5ldDEQMA4GA1UECgwHa2FsdHVyYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyiDNnoLi56KGDLRoJ0Y2dBj4G7++BtnhkBGqIB0AwF9O0hNgB5smGf6biR+D+qjhrux4tGLM3NBgeevoCBhb5aupP4/0MBeelhdDmoPfApYRVIXp0N0rSy0gVFRtr0sw9T0txuBq3jB/XzVHRmWA8dSm9H0kkoZEzWRViGWroPcCAwEAAaMvMC0wKwYDVR0RBCQwIoIgMzAwLW1lZGlhc3BhY2Uua2FsdHVyYS5ub3JkdS5uZXQwDQYJKoZIhvcNAQEFBQADgYEALwp3i9iN8738mOgmVLI6L/Q9CwtHpJ8HxPENk02v2gjOS5G81kkyjNT6cN5N5FXaLO/X3XmYMx/k3XWZuInvYHfWnGXb2geWycE1P/n150H4j7pq4RNKmoI0D2vlgdngcqjul/2iWjbUdEhOM3eZHbEdQA0Vwbk/PGV8mAuQfbI=</ds:X509Certificate>
+          <ds:X509Certificate>MIIDgDCCAmgCCQCROUvZYUy6nTANBgkqhkiG9w0BAQUFADCBgTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk5ZMREwDwYDVQQHDAhOZXcgWW9yazEVMBMGA1UECgwMS2FsdHVyYSBJbmMuMRQwEgYDVQQDDAtwbGF5LmthdS5zZTElMCMGCSqGSIb3DQEJARYWc2FtbF9hZG1pbkBrYWx0dXJhLmNvbTAeFw0xNDEyMTgxMzAxMTRaFw0yNDEyMTcxMzAxMTRaMIGBMQswCQYDVQQGEwJVUzELMAkGA1UECAwCTlkxETAPBgNVBAcMCE5ldyBZb3JrMRUwEwYDVQQKDAxLYWx0dXJhIEluYy4xFDASBgNVBAMMC3BsYXkua2F1LnNlMSUwIwYJKoZIhvcNAQkBFhZzYW1sX2FkbWluQGthbHR1cmEuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0XggMy5SNVvIqdLuynaM29/WMVAh5Utt7G8nyNJUDqsQ7Zh6ghh0RThxtLnmokPjljs9Kw2aVzAMz+hrf28q+F5915a3q6loTrfm0llxYeRn21023aGxki44p6/B5/8hmQSJQC8JfaI9PcMzI5FxBo/U10waEIeGXzaCCNIofCGa2eqeSVEdhCcT8kKE10E2WZy+8avd4E421POuaJW9osnqGh8m06FtaWqB+MiiETxzxIvMVZvIoF1bSjvDlV1+V0JB0Sl0SO6yU8aGO6P60LPK+y3RkeNkamMgKoLEFnZRUYeoukbLzrXuEyMUMYVFGpe+8MnK9APT3Ti+HHc6ZQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBzixsmpkDzazpnjcFicXmJGnRepcawDfirRKOyMCBIaXBi2lX7uWlicl3nD3FXT134aNCBSxrSK1iahiWVbkP5Oc/dleytoKRGgfRWlfgPXf94JcztaHOPu6C4Q2OdF9GvoE0bGzt9uiRMFBcajfgu0Ct0qjWxWyxtW7eOOC01cXX5lXoSmL90jjIJ2qkITpsWafpe2g+EBGaR+VcpYb3i/3j2U7f8XNDMdd6mObznD3l8246bgHMq2Eghw/qKLU6I1Vom23R0oy6xBUo+CDpYVqejh6r9bvkHPVj1o6dlJtSzbruZkUOhw9yqQR7iQjaRG0TSg/DZRfM4EpsjTJUC</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
-          <ds:X509Certificate>MIICMjCCAZugAwIBAgIUJthSm5mO42eUMlr5toLKJCLgBMowDQYJKoZIhvcNAQEFBQAwPTEpMCcGA1UEAwwgMzAwLW1lZGlhc3BhY2Uua2FsdHVyYS5ub3JkdS5uZXQxEDAOBgNVBAoMB2thbHR1cmEwHhcNMTgwNDIwMTE1NTE1WhcNMTkwNDIwMTE1NTE1WjA9MSkwJwYDVQQDDCAzMDAtbWVkaWFzcGFjZS5rYWx0dXJhLm5vcmR1Lm5ldDEQMA4GA1UECgwHa2FsdHVyYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyiDNnoLi56KGDLRoJ0Y2dBj4G7++BtnhkBGqIB0AwF9O0hNgB5smGf6biR+D+qjhrux4tGLM3NBgeevoCBhb5aupP4/0MBeelhdDmoPfApYRVIXp0N0rSy0gVFRtr0sw9T0txuBq3jB/XzVHRmWA8dSm9H0kkoZEzWRViGWroPcCAwEAAaMvMC0wKwYDVR0RBCQwIoIgMzAwLW1lZGlhc3BhY2Uua2FsdHVyYS5ub3JkdS5uZXQwDQYJKoZIhvcNAQEFBQADgYEALwp3i9iN8738mOgmVLI6L/Q9CwtHpJ8HxPENk02v2gjOS5G81kkyjNT6cN5N5FXaLO/X3XmYMx/k3XWZuInvYHfWnGXb2geWycE1P/n150H4j7pq4RNKmoI0D2vlgdngcqjul/2iWjbUdEhOM3eZHbEdQA0Vwbk/PGV8mAuQfbI=</ds:X509Certificate>
+          <ds:X509Certificate>MIIDgDCCAmgCCQCROUvZYUy6nTANBgkqhkiG9w0BAQUFADCBgTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk5ZMREwDwYDVQQHDAhOZXcgWW9yazEVMBMGA1UECgwMS2FsdHVyYSBJbmMuMRQwEgYDVQQDDAtwbGF5LmthdS5zZTElMCMGCSqGSIb3DQEJARYWc2FtbF9hZG1pbkBrYWx0dXJhLmNvbTAeFw0xNDEyMTgxMzAxMTRaFw0yNDEyMTcxMzAxMTRaMIGBMQswCQYDVQQGEwJVUzELMAkGA1UECAwCTlkxETAPBgNVBAcMCE5ldyBZb3JrMRUwEwYDVQQKDAxLYWx0dXJhIEluYy4xFDASBgNVBAMMC3BsYXkua2F1LnNlMSUwIwYJKoZIhvcNAQkBFhZzYW1sX2FkbWluQGthbHR1cmEuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0XggMy5SNVvIqdLuynaM29/WMVAh5Utt7G8nyNJUDqsQ7Zh6ghh0RThxtLnmokPjljs9Kw2aVzAMz+hrf28q+F5915a3q6loTrfm0llxYeRn21023aGxki44p6/B5/8hmQSJQC8JfaI9PcMzI5FxBo/U10waEIeGXzaCCNIofCGa2eqeSVEdhCcT8kKE10E2WZy+8avd4E421POuaJW9osnqGh8m06FtaWqB+MiiETxzxIvMVZvIoF1bSjvDlV1+V0JB0Sl0SO6yU8aGO6P60LPK+y3RkeNkamMgKoLEFnZRUYeoukbLzrXuEyMUMYVFGpe+8MnK9APT3Ti+HHc6ZQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBzixsmpkDzazpnjcFicXmJGnRepcawDfirRKOyMCBIaXBi2lX7uWlicl3nD3FXT134aNCBSxrSK1iahiWVbkP5Oc/dleytoKRGgfRWlfgPXf94JcztaHOPu6C4Q2OdF9GvoE0bGzt9uiRMFBcajfgu0Ct0qjWxWyxtW7eOOC01cXX5lXoSmL90jjIJ2qkITpsWafpe2g+EBGaR+VcpYb3i/3j2U7f8XNDMdd6mObznD3l8246bgHMq2Eghw/qKLU6I1Vom23R0oy6xBUo+CDpYVqejh6r9bvkHPVj1o6dlJtSzbruZkUOhw9yqQR7iQjaRG0TSg/DZRfM4EpsjTJUC</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-- 
cgit v1.2.3