Bytt plats på idp och idp3.sics i swamid-idp-2.0 och swamid-edugain

4 files changed, 18 insertions, 11 deletions

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">
diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml
index 28c9f451..5362387c 100644
--- a/swamid-edugain-idp-1.0.mxml
+++ b/swamid-edugain-idp-1.0.mxml
@@ -33,7 +33,7 @@
   <xi:include href="swamid-2.0/login.idp.hhs.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/login.idp.eduid.se-idp.xml"/>
-  <xi:include href="swamid-2.0/idp.sics.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp3.sics.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.kkh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/idp-v2.konstfack.se-adfs-services-trust.xml"/>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index 5a212728..700b4cad 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -18,6 +18,6 @@
   <xi:include href="swamid-2.0/idp3.hig.se-idp-shibboleth.xml"/>
   <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"/>
+  <xi:include href="swamid-2.0/idp.sics.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>