From d64fba8d2614761006d4a37eeae25ace1fac65ca Mon Sep 17 00:00:00 2001
From: Björn Mattsson <Bjorn.Mattsson@bth.se>
Date: Wed, 28 Feb 2018 16:26:57 +0100
Subject: Moved adfs.umu.se into edugain. SWAMID-513

---
 swamid-2.0/adfs.umu.se-adfs-services-trust.xml | 4 ++--
 swamid-edugain-idp-1.0.mxml                    | 1 +
 swamid-idp-2.0.mxml                            | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/swamid-2.0/adfs.umu.se-adfs-services-trust.xml b/swamid-2.0/adfs.umu.se-adfs-services-trust.xml
index 61fca470..dc9a62f9 100644
--- a/swamid-2.0/adfs.umu.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs.umu.se-adfs-services-trust.xml
@@ -627,8 +627,8 @@ Definierad av Erik Jonsson primärt för att avgöra om en person är dold</auth
 				</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.umu.se</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.umu.se/english</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="63" width="358">http://www.umu.se/static/images/umu_logo.jpg</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="63" width="350">http://www.umu.se/static/images/umu_logo_eng.jpg</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="63" width="358">https://www.umu.se/static/images/umu_logo.jpg</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="63" width="350">https://www.umu.se/static/images/umu_logo_eng.jpg</mdui:Logo>
         <mdui:Keywords xml:lang="sv">
 				umu umeå+universitet umea+universitet umea+university umeå+university umeå umea
 				</mdui:Keywords>
diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml
index aab0f88a..632102ee 100644
--- a/swamid-edugain-idp-1.0.mxml
+++ b/swamid-edugain-idp-1.0.mxml
@@ -49,4 +49,5 @@
   <xi:include href="swamid-2.0/login.ki.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/adfs.rkh.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/idp3.hig.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/adfs.umu.se-adfs-services-trust.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index 4b9a82b7..a8946080 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -11,5 +11,4 @@
   <xi:include href="swamid-2.0/idp.antagning.se-aws-idp.xml"/>
   <xi:include href="swamid-2.0/adfs2.gu.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/weblogin.smhi.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/adfs.umu.se-adfs-services-trust.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3