From 34dafceecf359e210ba3d1f30eaf23f63c6488a3 Mon Sep 17 00:00:00 2001
From: Björn Mattsson <Bjorn.Mattsson@bth.se>
Date: Tue, 14 Feb 2017 10:12:21 +0100
Subject: Bytt plats på idp och idp3.sics i swamid-idp-2.0 och swamid-edugain
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 swamid-2.0/idp.sics.se-idp-shibboleth.xml  | 15 +++++++++++----
 swamid-2.0/idp3.sics.se-idp-shibboleth.xml | 10 +++++-----
 2 files changed, 16 insertions(+), 9 deletions(-)

(limited to 'swamid-2.0')

diff --git a/swamid-2.0/idp.sics.se-idp-shibboleth.xml b/swamid-2.0/idp.sics.se-idp-shibboleth.xml
index f83f529d..ddf934be 100644
--- a/swamid-2.0/idp.sics.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.sics.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:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.sics.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 xmlns="" 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">sics.se</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SICS</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">SICS</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">SICS old</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">SICS old</mdui:DisplayName>
         <mdui:Description xml:lang="en">Identity Provider for SICS</mdui:Description>
         <mdui:Description xml:lang="sv">Identity Provider för SICS</mdui:Description>
         <mdui:InformationURL xml:lang="sv">https://www.sics.se</mdui:InformationURL>
@@ -91,8 +98,8 @@ pM5riVx3/xM8O8O7qu76POFup5Bz23btNiSK
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">SICS</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SICS</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="sv">SICS</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">SICS old</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">SICS old</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">https://www.sics.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
diff --git a/swamid-2.0/idp3.sics.se-idp-shibboleth.xml b/swamid-2.0/idp3.sics.se-idp-shibboleth.xml
index 43cdee30..0eaabfc7 100644
--- a/swamid-2.0/idp3.sics.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp3.sics.se-idp-shibboleth.xml
@@ -4,8 +4,8 @@
     <Extensions>
       <shibmd:Scope regexp="false">sics.se</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">SICS new</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">SICS ny</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">SICS</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">SICS</mdui:DisplayName>
         <mdui:Description xml:lang="en">Identity Provider for SICS</mdui:Description>
         <mdui:Description xml:lang="sv">Identity Provider för SICS</mdui:Description>
         <mdui:InformationURL xml:lang="sv">https://www.sics.se</mdui:InformationURL>
@@ -184,9 +184,9 @@ RSPI3dYXTAE9qA5awk/PGw+gfj7d8mqBUfuSj+KU4A==
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.sics.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
   </AttributeAuthorityDescriptor>
   <Organization>
-    <OrganizationName xml:lang="en">SICS ny</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SICS new</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="sv">SICS ny</OrganizationDisplayName>
+    <OrganizationName xml:lang="en">SICS</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">SICS</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">SICS</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">https://www.sics.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
-- 
cgit v1.2.3