From 60d98d8b165b662566e9def64d6344b374190b78 Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Wed, 22 Sep 2021 10:20:31 +0200
Subject: SWAMID-377 two extra servers to R&S

---
 swamid-2.0/disposer.c3se.chalmers.se.xml | 29 +++++++++++++++++++++++------
 swamid-2.0/supr.snic.se.xml              | 29 +++++++++++++++++++++++------
 2 files changed, 46 insertions(+), 12 deletions(-)

(limited to 'swamid-2.0')

diff --git a/swamid-2.0/disposer.c3se.chalmers.se.xml b/swamid-2.0/disposer.c3se.chalmers.se.xml
index 630921ce..362ce2c6 100644
--- a/swamid-2.0/disposer.c3se.chalmers.se.xml
+++ b/swamid-2.0/disposer.c3se.chalmers.se.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <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://disposer.c3se.chalmers.se">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-11-14T10:14:25Z">
@@ -21,8 +17,7 @@ and do *NOT* provide it in real time to your partners.
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <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/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>
   </md:Extensions>
@@ -35,6 +30,8 @@ and do *NOT* provide it in real time to your partners.
         <mdui:DisplayName xml:lang="en">SUPR test server Disposer</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Testserver (Disposer) för SNIC User and Project Repository (SUPR).</mdui:Description>
         <mdui:Description xml:lang="en">Test server (Disposer) for the SNIC User and Project Repository (SUPR).</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://supr.snic.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://supr.snic.se/</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -83,4 +80,24 @@ o/agI+HB5oEGJQGKjPQGnNTpng==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://disposer.c3se.chalmers.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://disposer.c3se.chalmers.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SNIC</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">SNIC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish National Infrastructure for Computing</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Swedish National Infrastructure for Computing</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://snic.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://snic.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:SurName>Support SUPR</md:SurName>
+    <md:EmailAddress>mailto:support@supr.snic.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Support SUPR</md:SurName>
+    <md:EmailAddress>mailto:support@supr.snic.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Support SUPR</md:SurName>
+    <md:EmailAddress>mailto:support@supr.snic.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/supr.snic.se.xml b/swamid-2.0/supr.snic.se.xml
index 87f5cf4c..bd03993f 100644
--- a/swamid-2.0/supr.snic.se.xml
+++ b/swamid-2.0/supr.snic.se.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <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://supr.snic.se">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-11-14T10:14:25Z">
@@ -21,8 +17,7 @@ and do *NOT* provide it in real time to your partners.
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <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/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>
   </md:Extensions>
@@ -35,6 +30,8 @@ and do *NOT* provide it in real time to your partners.
         <mdui:DisplayName xml:lang="en">SUPR</mdui:DisplayName>
         <mdui:Description xml:lang="sv">SNIC User and Project Repository (SUPR)</mdui:Description>
         <mdui:Description xml:lang="en">SNIC User and Project Repository (SUPR)</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://supr.snic.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://supr.snic.se/</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -84,4 +81,24 @@ m9Ea0VNPPWBYZkyQ68fOqw==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://supr.snic.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://supr.snic.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SNIC</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">SNIC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish National Infrastructure for Computing</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Swedish National Infrastructure for Computing</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://snic.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://snic.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:SurName>Support SUPR</md:SurName>
+    <md:EmailAddress>mailto:support@supr.snic.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Support SUPR</md:SurName>
+    <md:EmailAddress>mailto:support@supr.snic.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Support SUPR</md:SurName>
+    <md:EmailAddress>mailto:support@supr.snic.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
-- 
cgit v1.2.3