HiG IdP switch

5 files changed, 23 insertions, 16 deletions

diff --git a/swamid-2.0/idp.hig.se-idp-shibboleth.xml b/swamid-2.0/idp.hig.se-idp-shibboleth.xml
index 9dca094e..727630f7 100644
--- a/swamid-2.0/idp.hig.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.hig.se-idp-shibboleth.xml
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.hig.se/idp/shibboleth">
   <Extensions>
-    <attr:EntityAttributes xmlns:attr="urn:oasis:names:tc:SAML:metadata: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">
+    <attr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute 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:Attribute>
+      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
     </attr:EntityAttributes>
   </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope regexp="false">hig.se</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Högskolan i Gävle</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Gävle</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Högskolan i Gävle (gammal)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Gävle (old)</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan i Gävle.</mdui:Description>
         <mdui:Description xml:lang="en">The University of Gävle Identity Provider is used by employees and students at the university.</mdui:Description>
         <mdui:Logo height="94" width="83">https://webkonto.student.hig.se/head/loggaengelska.png</mdui:Logo>
@@ -102,8 +105,8 @@ otLAA/GPqLtaaQ1u9fpDcdN5GjkHR1QyYN/UhhF0iXczvUp4o/D0ELbtdBPA5Rwf
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">HIG</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Högskolan i Gävle</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Gävle</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Högskolan i Gävle (gammal)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Gävle (old)</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.hig.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
diff --git a/swamid-2.0/idp2.hig.se-idp-shibboleth.xml b/swamid-2.0/idp2.hig.se-idp-shibboleth.xml
index 634b3596..38b96366 100644
--- a/swamid-2.0/idp2.hig.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp2.hig.se-idp-shibboleth.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp2.hig.se/idp/shibboleth">
+  <Extensions>
+    <attr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </attr:EntityAttributes>
+  </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope regexp="false">hig.se</shibmd:Scope>
diff --git a/swamid-2.0/idp3.hig.se-idp-shibboleth.xml b/swamid-2.0/idp3.hig.se-idp-shibboleth.xml
index ffdf049b..d1d1c17e 100644
--- a/swamid-2.0/idp3.hig.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp3.hig.se-idp-shibboleth.xml
@@ -5,17 +5,14 @@
       <saml:Attribute 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:Attribute>
-      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
     </attr:EntityAttributes>
   </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <Extensions>
       <shibmd:Scope regexp="false">hig.se</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Högskolan i Gävle (ny)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Gävle (new)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Högskolan i Gävle</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Gävle</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan i Gävle.</mdui:Description>
         <mdui:Description xml:lang="en">The University of Gävle Identity Provider is used by employees and students at the university.</mdui:Description>
         <mdui:Logo height="94" width="83">https://webkonto.student.hig.se/head/loggaengelska.png</mdui:Logo>
@@ -199,8 +196,8 @@ uSUv8QvuQcOa9kYsSNH4o1+qTVp8mrFCghss
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">HIG</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Högskolan i Gävle (ny)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Gävle (new)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Högskolan i Gävle</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Gävle</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.hig.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml
index dd75bada..aab0f88a 100644
--- a/swamid-edugain-idp-1.0.mxml
+++ b/swamid-edugain-idp-1.0.mxml
@@ -4,8 +4,6 @@
                        Name="http://md.swamid.se/md/swamid-idp-2.0.xml">
   <xi:include href="swamid-2.0/idp.nordu.net-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.chalmers.se-adfs-services-trust.xml"/>
-  <xi:include href="swamid-2.0/idp.hig.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/idp2.hig.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.lnu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/login.du.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.mah.se-idp-shibboleth.xml"/>
@@ -50,4 +48,5 @@
   <xi:include href="swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml"/>
   <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"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index 8ae06f99..820f759c 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -9,11 +9,12 @@
   <xi:include href="swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.qa.lnu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml"/>
-  <xi:include href="swamid-2.0/idp3.hig.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.sics.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.antagning.se-aws-idp.xml"/>
   <xi:include href="swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp2.hv.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/kiidp.ki.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/adfs2.gu.se-adfs-services-trust.xml"/>
+  <xi:include href="swamid-2.0/idp2.hig.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp.hig.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>