Switch HiS IdPs

4 files changed, 11 insertions, 9 deletions

diff --git a/swamid-2.0/idp.his.se-idp-shibboleth.xml b/swamid-2.0/idp.his.se-idp-shibboleth.xml
index 6d4bbc2a..efcad847 100644
--- a/swamid-2.0/idp.his.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.his.se-idp-shibboleth.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" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">
-      <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" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
@@ -18,8 +15,8 @@
     <Extensions>
       <shibmd:Scope regexp="false">his.se</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Högskolan i Skövde (new)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Högskolan i Skövde (ny)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Skövde</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Högskolan i Skövde</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för Högskolan i Skövde</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for University of Skövde</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.his.se</mdui:InformationURL>
diff --git a/swamid-2.0/idp2.his.se-idp-shibboleth.xml b/swamid-2.0/idp2.his.se-idp-shibboleth.xml
index 9c92945e..13da7c48 100644
--- a/swamid-2.0/idp2.his.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp2.his.se-idp-shibboleth.xml
@@ -4,13 +4,18 @@
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-03-14T15:36:04Z">
       <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" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">
+      <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>
+    </mdattr:EntityAttributes>
   </md:Extensions>
   <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp2.his.se/idp/shibboleth">
     <Extensions>
       <shibmd:Scope regexp="false">his.se</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Högskolan i Skövde</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Skövde</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Högskolan i Skövde (gammal)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Skövde (old)</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för Högskolan i Skövde</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for University of Skövde</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.his.se</mdui:InformationURL>
diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml
index 808f3da0..ec4a397d 100644
--- a/swamid-edugain-idp-1.0.mxml
+++ b/swamid-edugain-idp-1.0.mxml
@@ -36,7 +36,7 @@
   <xi:include href="swamid-2.0/idp.ltu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.hh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp01.gih.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/idp2.his.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp.his.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.hb.se-idp-shibboleth.xml"/>
   <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"/>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index 46a65cda..a12be7c7 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -12,5 +12,5 @@
   <xi:include href="swamid-2.0/sts.vinnova.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/swamid.vr.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/fs.uka.se-adfs-services-trust.xml"/>
-  <xi:include href="swamid-2.0/idp.his.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp2.his.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>