From 5da0ac9434b448c8d78c61b55b574a8041fd2f4a Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Tue, 31 Jan 2017 14:56:15 +0100
Subject: Add new gih idp to swamid-2.0 with hide from disco

---
 swamid-2.0/idp01.gih.se-idp-shibboleth.xml | 17 +++++++++++------
 swamid-idp-2.0.mxml                        |  1 +
 swamid-testing-idp-1.0.mxml                |  2 --
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/swamid-2.0/idp01.gih.se-idp-shibboleth.xml b/swamid-2.0/idp01.gih.se-idp-shibboleth.xml
index 16bfab4f..018dd598 100644
--- a/swamid-2.0/idp01.gih.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp01.gih.se-idp-shibboleth.xml
@@ -1,11 +1,18 @@
 <?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:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://idp01.gih.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: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">gih.se</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Gymnastik- och idrottshögskolan - Test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">The Swedish School of Sport and Health Sciences - Test</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Gymnastik- och idrottshögskolan - Ny</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">The Swedish School of Sport and Health Sciences - New</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identitetsutgivare för Gymnastik- och Idrottshögskolan vid Stockholms Stadion</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for The Swedish School of Sport and Health Sciences</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.gih.se/</mdui:InformationURL>
@@ -184,13 +191,11 @@ MEsSqGHVIFzyCxPzfTl7HEhnSzXaKE07ShUemr6eig==
       </ds:KeyInfo>
     </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp01.gih.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp01.gih.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> -->
-    <!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">The Swedish School of sport and health sciences</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Gymnastik- och idrottshögskolan - Test</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">The Swedish School of Sport and Health Sciences - Test</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Gymnastik- och idrottshögskolan - Ny</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">The Swedish School of Sport and Health Sciences - New</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.gih.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index 886d74e0..5a212728 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -19,4 +19,5 @@
   <xi:include href="swamid-2.0/signon.hh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp3.sics.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp01.gih.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index fc463c8f..b9b017d9 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -25,7 +25,6 @@
   <xi:include href="swamid-2.0/idp.esh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/kitstidp01.tst.ki.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/swamid2.shh.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp3.hv.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/shibboleth.umu.se-test.xml"/>
   <xi:include href="swamid-2.0/pilot.idp.eduid.se-idp.xml"/>
@@ -51,7 +50,6 @@
   <xi:include href="swamid-2.0/idp2.it.gu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/nya-00.ladok.umu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/weblogin.test.uu.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/idp01.gih.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/testswamid.vr.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp2.rkh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/weblogin-test.kau.se-idp-shibboleth.xml"/>
-- 
cgit v1.2.3