From f49e129faee956065dfeaf38e4e08b46ac4d1a72 Mon Sep 17 00:00:00 2001
From: Johan Wassberg <jocar@sunet.se>
Date: Wed, 7 Dec 2022 11:24:43 -0700
Subject: SWAMID-2235: Updated keystone-beta.cloud.ipnett.se

---
 .../keystone-beta.cloud.ipnett.se-shibboleth.xml   | 30 ++++++++++++----------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'swamid-edugain/keystone-beta.cloud.ipnett.se-shibboleth.xml')

diff --git a/swamid-edugain/keystone-beta.cloud.ipnett.se-shibboleth.xml b/swamid-edugain/keystone-beta.cloud.ipnett.se-shibboleth.xml
index f3279d23..45a948f2 100644
--- a/swamid-edugain/keystone-beta.cloud.ipnett.se-shibboleth.xml
+++ b/swamid-edugain/keystone-beta.cloud.ipnett.se-shibboleth.xml
@@ -6,8 +6,6 @@
     </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://www.swamid.se/category/hei-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>
@@ -21,15 +19,14 @@
         <mdui:Description xml:lang="sv">IPnett Cloud Services OpenStack</mdui:Description>
         <mdui:InformationURL xml:lang="sv">https://wiki.sunet.se/display/Molntjanster</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://wiki.sunet.se/display/Molntjanster</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" width="77" height="64">https://idp.cloud.ipnett.se/ipnett.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" width="77" height="64">https://idp.cloud.ipnett.se/ipnett.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.safespring.com/dokument/sunet/safespring-swamid-privacy-policy/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.safespring.com/dokument/sunet/safespring-swamid-privacy-policy/</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-            MIIDIzCCAgugAwIBAgIJAPPowPSKvgZgMA0GCSqGSIb3DQEBCwUAMCgxJjAkBgNV
+          <ds:X509Certificate>MIIDIzCCAgugAwIBAgIJAPPowPSKvgZgMA0GCSqGSIb3DQEBCwUAMCgxJjAkBgNV
             BAMMHWtleXN0b25lLWJldGEuY2xvdWQuaXBuZXR0LnNlMB4XDTE2MDMzMDA2MTY0
             OVoXDTI3MDMxMzA2MTY0OVowKDEmMCQGA1UEAwwda2V5c3RvbmUtYmV0YS5jbG91
             ZC5pcG5ldHQuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbE4Dd
@@ -45,16 +42,14 @@
             D7Lz/Kjll9LN8mArW1jJ4psqDU9RX4otDP8AUUVo5K9daCjBbxcj4RIMfpmlcw7a
             MpN8pGtS0Z6VNxC4XsCmM+2mRu4cvlwhHOwu7hy4vK8OLOaj6SNiJYHSi/5ZoQv7
             VNEtE1FJ0y6Fox7OG48x+S//SkzDkNkOgo/tRSJhb5bQQBpOMtNF6WNp8cqnkFst
-            uCNQenEiZ9DSiyNJmsiqWMsdir/9+GWp0VpsJLLq878kAxtPFQid
-          </ds:X509Certificate>
+            uCNQenEiZ9DSiyNJmsiqWMsdir/9+GWp0VpsJLLq878kAxtPFQid</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-            MIIDIzCCAgugAwIBAgIJAPPowPSKvgZgMA0GCSqGSIb3DQEBCwUAMCgxJjAkBgNV
+          <ds:X509Certificate>MIIDIzCCAgugAwIBAgIJAPPowPSKvgZgMA0GCSqGSIb3DQEBCwUAMCgxJjAkBgNV
             BAMMHWtleXN0b25lLWJldGEuY2xvdWQuaXBuZXR0LnNlMB4XDTE2MDMzMDA2MTY0
             OVoXDTI3MDMxMzA2MTY0OVowKDEmMCQGA1UEAwwda2V5c3RvbmUtYmV0YS5jbG91
             ZC5pcG5ldHQuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbE4Dd
@@ -70,8 +65,7 @@
             D7Lz/Kjll9LN8mArW1jJ4psqDU9RX4otDP8AUUVo5K9daCjBbxcj4RIMfpmlcw7a
             MpN8pGtS0Z6VNxC4XsCmM+2mRu4cvlwhHOwu7hy4vK8OLOaj6SNiJYHSi/5ZoQv7
             VNEtE1FJ0y6Fox7OG48x+S//SkzDkNkOgo/tRSJhb5bQQBpOMtNF6WNp8cqnkFst
-            uCNQenEiZ9DSiyNJmsiqWMsdir/9+GWp0VpsJLLq878kAxtPFQid
-          </ds:X509Certificate>
+            uCNQenEiZ9DSiyNJmsiqWMsdir/9+GWp0VpsJLLq878kAxtPFQid</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
@@ -88,11 +82,19 @@
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
   </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Safespring</md:Company>
+    <md:GivenName>Safespring Operations</md:GivenName>
+    <md:EmailAddress>mailto:support@safespring.com</md:EmailAddress>
+  </md:ContactPerson>
   <md:ContactPerson contactType="technical">
-    <md:SurName>Technical Support (SafeSpring)</md:SurName>
-    <md:EmailAddress>mailto:iaas@cloud.ipnett.se</md:EmailAddress>
+    <md:SurName>Safespring Operations</md:SurName>
+    <md:EmailAddress>mailto:support@safespring.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
-- 
cgit v1.2.3