From 0f7025c833c206c75f17e52ba726ff517f82464f Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Tue, 7 Jun 2016 15:59:38 +0200
Subject: SWAMIDOPS-8233 Change IdP vr.se

---
 swamid-idp-2.0.mxml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'swamid-idp-2.0.mxml')

diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index 7b36e41f..dc2c16ff 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -15,4 +15,5 @@
   <xi:include href="swamid-2.0/idp.qa.lnu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/weblogindev-uu-se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/weblogin.kau.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/livesrv.ex.vr.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3


From f1cf8cba1ea2ec00f4862f33829aa0ee22845eb2 Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Wed, 8 Jun 2016 12:52:56 +0200
Subject: Move login.fhs.se IdP from test to prod with hide from disc

---
 swamid-2.0/login.fhs.se-adfs-services-trust.xml | 7 +++++++
 swamid-idp-2.0.mxml                             | 1 +
 swamid-testing-idp-1.0.mxml                     | 1 -
 3 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'swamid-idp-2.0.mxml')

diff --git a/swamid-2.0/login.fhs.se-adfs-services-trust.xml b/swamid-2.0/login.fhs.se-adfs-services-trust.xml
index f219f548..001c41bc 100644
--- a/swamid-2.0/login.fhs.se-adfs-services-trust.xml
+++ b/swamid-2.0/login.fhs.se-adfs-services-trust.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://login.fhs.se/adfs/services/trust">
+  <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>
   <RoleDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:ApplicationServiceType" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="Försvarshögskolan">
     <KeyDescriptor use="encryption">
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index dc2c16ff..2afa3ec7 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -16,4 +16,5 @@
   <xi:include href="swamid-2.0/weblogindev-uu-se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/weblogin.kau.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/livesrv.ex.vr.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/login.fhs.se-adfs-services-trust.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 29ac85d6..0b7bae79 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -65,5 +65,4 @@
   <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/login.fhs.se-adfs-services-trust.xml"/>
 </EntitiesDescriptor>
-- 
cgit v1.2.3