From 3e82be788e37a56511f97143a464477833c1b815 Mon Sep 17 00:00:00 2001
From: Björn Mattsson <bjorn@sunet.se>
Date: Tue, 16 Nov 2021 10:15:06 +0100
Subject: SWAMID-359, swap old and new IdP for fhs.se

---
 swamid-2.0/login1.fhs.se-adfs-services-trust.xml | 11 +++++++----
 swamid-2.0/login2.fhs.se-adfs-services-trust.xml |  7 ++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/swamid-2.0/login1.fhs.se-adfs-services-trust.xml b/swamid-2.0/login1.fhs.se-adfs-services-trust.xml
index 340d1d6a..68dc2c7a 100644
--- a/swamid-2.0/login1.fhs.se-adfs-services-trust.xml
+++ b/swamid-2.0/login1.fhs.se-adfs-services-trust.xml
@@ -5,6 +5,9 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <attr:EntityAttributes xmlns:attr="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://refeds.org/category/hide-from-discovery</samla:AttributeValue>
+      </samla:Attribute>
       <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
         <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
@@ -21,10 +24,10 @@
       <shibmd:Scope regexp="false">student.fhs.se</shibmd:Scope>
       <shibmd:Scope regexp="false">op.fhs.se</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Försvarshögskolan</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Swedish Defence University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Försvarshögskolan</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Swedish Defence University</mdui:Description>
+        <mdui:DisplayName xml:lang="sv">Försvarshögskolan - OLD</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Swedish Defence University - OLD</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Försvarshögskolan - OLD</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Swedish Defence University - OLD</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.fhs.se</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.fhs.se/en/</mdui:InformationURL>
         <mdui:Logo xml:lang="sv" height="671" width="2494">https://login1.fhs.se/adfs/portal/logo/logo.jpg</mdui:Logo>
diff --git a/swamid-2.0/login2.fhs.se-adfs-services-trust.xml b/swamid-2.0/login2.fhs.se-adfs-services-trust.xml
index 41ad3029..df4a2251 100644
--- a/swamid-2.0/login2.fhs.se-adfs-services-trust.xml
+++ b/swamid-2.0/login2.fhs.se-adfs-services-trust.xml
@@ -5,9 +5,6 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <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://refeds.org/category/hide-from-discovery</samla:AttributeValue>
-      </samla:Attribute>
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
@@ -24,8 +21,8 @@
       <shibmd:Scope regexp="false">student.fhs.se</shibmd:Scope>
       <shibmd:Scope regexp="false">op.fhs.se</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Försvarshögskolan - NEW</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Swedish Defence University - NEW</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Försvarshögskolan</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Swedish Defence University</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för Försvarshögskolan - NEW</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for Swedish Defence University - NEW</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.fhs.se</mdui:InformationURL>
-- 
cgit v1.2.3