From f8ae2497855294b3ba7fa583312a23f781aee7de Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Tue, 19 Sep 2017 11:53:09 +0200
Subject: Resolves SWAMIDOPS-195 again

---
 swamid-2.0/cloudmore.com-shibboleth.xml            |  2 +-
 swamid-2.0/dev.cloudmore.com-shibboleth.xml        |  2 +-
 swamid-2.0/local.cloudmore.com-shibboleth.xml      | 26 +++++++++++-----------
 swamid-2.0/prestaging.cloudmore.com-shibboleth.xml |  2 +-
 swamid-2.0/staging.cloudmore.com-shibboleth.xml    |  2 +-
 swamid-edugain-sp-1.0.mxml                         |  5 +++++
 swamid-sp-2.0.mxml                                 |  6 -----
 7 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/swamid-2.0/cloudmore.com-shibboleth.xml b/swamid-2.0/cloudmore.com-shibboleth.xml
index 2010b8f1..8d032f49 100644
--- a/swamid-2.0/cloudmore.com-shibboleth.xml
+++ b/swamid-2.0/cloudmore.com-shibboleth.xml
@@ -29,7 +29,7 @@
         <mdui:DisplayName xml:lang="en">Cloudmore</mdui:DisplayName>
         <mdui:Description xml:lang="en">Cloud Brokerage Platform for IT, Business and Public Sector</mdui:Description>
         <mdui:InformationURL xml:lang="en">http://web.cloudmore.com/</mdui:InformationURL>
-        <mdui:Logo height="300" width="300">http://web.cloudmore.com/hubfs/images/icons/Cloudmore-green-icon.png</mdui:Logo>
+        <mdui:Logo height="300" width="300">https://cloudmore.com/Files/Uploads/Shibboleth/Cloudmore-green-icon.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
diff --git a/swamid-2.0/dev.cloudmore.com-shibboleth.xml b/swamid-2.0/dev.cloudmore.com-shibboleth.xml
index 98f7e3f0..46f05471 100644
--- a/swamid-2.0/dev.cloudmore.com-shibboleth.xml
+++ b/swamid-2.0/dev.cloudmore.com-shibboleth.xml
@@ -26,7 +26,7 @@
         <mdui:DisplayName xml:lang="en">Cloudmore</mdui:DisplayName>
         <mdui:Description xml:lang="en">Cloud Brokerage Platform for IT, Business and Public Sector</mdui:Description>
         <mdui:InformationURL xml:lang="en">http://web.cloudmore.com/</mdui:InformationURL>
-        <mdui:Logo height="300" width="300">http://web.cloudmore.com/hubfs/images/icons/Cloudmore-green-icon.png</mdui:Logo>
+        <mdui:Logo height="300" width="300">https://cloudmore.com/Files/Uploads/Shibboleth/Cloudmore-green-icon.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
diff --git a/swamid-2.0/local.cloudmore.com-shibboleth.xml b/swamid-2.0/local.cloudmore.com-shibboleth.xml
index 7709c982..23fd055c 100644
--- a/swamid-2.0/local.cloudmore.com-shibboleth.xml
+++ b/swamid-2.0/local.cloudmore.com-shibboleth.xml
@@ -20,13 +20,13 @@
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.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="http://local.cloudmore.com/Shibboleth.sso/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="http://local.cloudmore.com/Shibboleth.sso/Login" index="1"/>
+      <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://local.cloudmore.com/Shibboleth.sso/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://local.cloudmore.com/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Cloudmore</mdui:DisplayName>
         <mdui:Description xml:lang="en">Cloud Brokerage Platform for IT, Business and Public Sector</mdui:Description>
         <mdui:InformationURL xml:lang="en">http://web.cloudmore.com/</mdui:InformationURL>
-        <mdui:Logo height="300" width="300">http://web.cloudmore.com/hubfs/images/icons/Cloudmore-green-icon.png</mdui:Logo>
+        <mdui:Logo height="300" width="300">https://cloudmore.com/Files/Uploads/Shibboleth/Cloudmore-green-icon.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -69,16 +69,16 @@ f49DvQ516YA=
       <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="http://local.cloudmore.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="http://local.cloudmore.com/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://local.cloudmore.com/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://local.cloudmore.com/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://local.cloudmore.com/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://local.cloudmore.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://local.cloudmore.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="http://local.cloudmore.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://local.cloudmore.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="http://local.cloudmore.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://local.cloudmore.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://local.cloudmore.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://local.cloudmore.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://local.cloudmore.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://local.cloudmore.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://local.cloudmore.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://local.cloudmore.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://local.cloudmore.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://local.cloudmore.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://local.cloudmore.com/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Cloudmore AB</md:OrganizationName>
diff --git a/swamid-2.0/prestaging.cloudmore.com-shibboleth.xml b/swamid-2.0/prestaging.cloudmore.com-shibboleth.xml
index 865eafc3..e4574ce6 100644
--- a/swamid-2.0/prestaging.cloudmore.com-shibboleth.xml
+++ b/swamid-2.0/prestaging.cloudmore.com-shibboleth.xml
@@ -27,7 +27,7 @@
         <mdui:DisplayName xml:lang="en">Cloudmore</mdui:DisplayName>
         <mdui:Description xml:lang="en">Cloud Brokerage Platform for IT, Business and Public Sector</mdui:Description>
         <mdui:InformationURL xml:lang="en">http://web.cloudmore.com/</mdui:InformationURL>
-        <mdui:Logo height="300" width="300">http://web.cloudmore.com/hubfs/images/icons/Cloudmore-green-icon.png</mdui:Logo>
+        <mdui:Logo height="300" width="300">https://cloudmore.com/Files/Uploads/Shibboleth/Cloudmore-green-icon.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
diff --git a/swamid-2.0/staging.cloudmore.com-shibboleth.xml b/swamid-2.0/staging.cloudmore.com-shibboleth.xml
index 57237d65..e489216f 100644
--- a/swamid-2.0/staging.cloudmore.com-shibboleth.xml
+++ b/swamid-2.0/staging.cloudmore.com-shibboleth.xml
@@ -28,7 +28,7 @@
         <mdui:DisplayName xml:lang="en">Cloudmore</mdui:DisplayName>
         <mdui:Description xml:lang="en">Cloud Brokerage Platform for IT, Business and Public Sector</mdui:Description>
         <mdui:InformationURL xml:lang="en">http://web.cloudmore.com/</mdui:InformationURL>
-        <mdui:Logo height="300" width="300">http://web.cloudmore.com/hubfs/images/icons/Cloudmore-green-icon.png</mdui:Logo>
+        <mdui:Logo height="300" width="300">https://cloudmore.com/Files/Uploads/Shibboleth/Cloudmore-green-icon.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
diff --git a/swamid-edugain-sp-1.0.mxml b/swamid-edugain-sp-1.0.mxml
index c55e65f2..479ef025 100644
--- a/swamid-edugain-sp-1.0.mxml
+++ b/swamid-edugain-sp-1.0.mxml
@@ -29,4 +29,9 @@
   <xi:include href="swamid-2.0/indico.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/kantarainitiative.org-confluence-plugins-servlet-samlsso.xml"/>
   <xi:include href="swamid-2.0/connect2.sunet.se-shibboleth.sso-metadata.xml"/>
+  <xi:include href="swamid-2.0/prestaging.cloudmore.com-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/staging.cloudmore.com-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/cloudmore.com-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/dev.cloudmore.com-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/local.cloudmore.com-shibboleth.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 9185ea6f..2f63ee3e 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -668,12 +668,6 @@
   <xi:include href="swamid-2.0/zoom-saas-idp-proxy.sunet.se-sp.xml"/>
   <xi:include href="swamid-2.0/almagest.sai.kau.se.xml"/>
   <xi:include href="swamid-2.0/pingpong.hj.se-Shibboleth.sso-Metadata.xml"/>
-  <xi:include href="swamid-2.0/prestaging.cloudmore.com-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/staging.cloudmore.com-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/cloudmore.com-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/dev.cloudmore.com-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/local.cloudmore.com-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/connect2.sunet.se-shibboleth.sso-metadata.xml"/>
   <xi:include href="swamid-2.0/redcap.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/redcap.tst.ki.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3