From 6984231814825dac74d268e9e3f9746dcb7ac067 Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Thu, 31 Aug 2017 20:38:02 +0200
Subject: More cleanup

---
 swamid-2.0/www.scalable-learning.com.xml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'swamid-2.0/www.scalable-learning.com.xml')

diff --git a/swamid-2.0/www.scalable-learning.com.xml b/swamid-2.0/www.scalable-learning.com.xml
index 5d337d8b..cbc241dd 100644
--- a/swamid-2.0/www.scalable-learning.com.xml
+++ b/swamid-2.0/www.scalable-learning.com.xml
@@ -47,9 +47,7 @@ fkpQngoTsFRNOJ5gwo2dZAVQYRBKXToI2elv5qW151WnpWn9gdQjaW7zzKSkPDRf
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:NameIDFormat>
-urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress
-</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="1" Location="https://www.scalable-learning.com/saml/consume"/>
     <md:AttributeConsumingService index="0">
       <md:ServiceName xml:lang="en">Scalable Learning</md:ServiceName>
@@ -66,6 +64,14 @@ urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress
   <md:Organization>
     <md:OrganizationName xml:lang="en">Scalable Learning</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Scalable Learning</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">www.scalable-learning.com</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.scalable-learning.com</md:OrganizationURL>
   </md:Organization>
+  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <Company>ScalableLearning</Company>
+    <EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <Company>ScalableLearning</Company>
+    <EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
-- 
cgit v1.2.3


From edbd9035acb660c937d446566bdd835409f14a40 Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Fri, 1 Sep 2017 10:16:39 +0200
Subject: More eduGAIN cleanup

---
 swamid-2.0/scalear-saml.herokuapp.com.xml     | 3 ++-
 swamid-2.0/scalear-staging2.herokuapp.com.xml | 1 +
 swamid-2.0/www.scalable-learning.com.xml      | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'swamid-2.0/www.scalable-learning.com.xml')

diff --git a/swamid-2.0/scalear-saml.herokuapp.com.xml b/swamid-2.0/scalear-saml.herokuapp.com.xml
index 5a61fc2f..0151e980 100644
--- a/swamid-2.0/scalear-saml.herokuapp.com.xml
+++ b/swamid-2.0/scalear-saml.herokuapp.com.xml
@@ -29,11 +29,12 @@
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="1" Location="https://scalear-saml.herokuapp.com/saml/consume"/>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Scalable Learning</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Scalable Learning</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">www.scalable-learning.com</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.scalable-learning.com</md:OrganizationURL>
   </md:Organization>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/scalear-staging2.herokuapp.com.xml b/swamid-2.0/scalear-staging2.herokuapp.com.xml
index 8c35e8c4..84057d0d 100644
--- a/swamid-2.0/scalear-staging2.herokuapp.com.xml
+++ b/swamid-2.0/scalear-staging2.herokuapp.com.xml
@@ -49,6 +49,7 @@ qONqqzvm+WBOIQ==
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="1" Location="https://scalear-staging2.herokuapp.com/saml/consume"/>
     <md:AttributeConsumingService index="0">
       <md:ServiceName xml:lang="en">Scalable Learning</md:ServiceName>
diff --git a/swamid-2.0/www.scalable-learning.com.xml b/swamid-2.0/www.scalable-learning.com.xml
index cbc241dd..1c6ae3ef 100644
--- a/swamid-2.0/www.scalable-learning.com.xml
+++ b/swamid-2.0/www.scalable-learning.com.xml
@@ -48,6 +48,7 @@ fkpQngoTsFRNOJ5gwo2dZAVQYRBKXToI2elv5qW151WnpWn9gdQjaW7zzKSkPDRf
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="1" Location="https://www.scalable-learning.com/saml/consume"/>
     <md:AttributeConsumingService index="0">
       <md:ServiceName xml:lang="en">Scalable Learning</md:ServiceName>
-- 
cgit v1.2.3