From 4c570312bf46f3c3764aef78217b73240bf4cabc Mon Sep 17 00:00:00 2001
From: Björn Mattsson <Bjorn.Mattsson@bth.se>
Date: Thu, 4 Jan 2018 07:45:46 +0100
Subject: Tried to fixed problem shib-idp-2 not showing up in Edugain

---
 swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml |  8 +++----
 swamid-2.0/shib-idp-2.oru.se-idp-shibboleth.xml | 32 +++++++++++++++++++++++--
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml b/swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml
index 665c147d..423a069f 100644
--- a/swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml
+++ b/swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml
@@ -17,8 +17,8 @@
     <Extensions>
       <shibmd:Scope regexp="false">oru.se</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Örebro universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Örebro University</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Örebro universitet - Old</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Örebro University - Old</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för Örebro universitet</mdui:Description>
         <mdui:Description xml:lang="en">Örebro University Identity Provider</mdui:Description>
         <mdui:Logo height="65" width="90">https://cas-01.oru.se/cas/Logo_txt_runt_farg.gif</mdui:Logo>
@@ -100,8 +100,8 @@ Pz8R3A==</ds:X509Certificate>
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">ORU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Örebro universitet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Örebro University</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Örebro universitet - Old</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Örebro University - Old</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.oru.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
diff --git a/swamid-2.0/shib-idp-2.oru.se-idp-shibboleth.xml b/swamid-2.0/shib-idp-2.oru.se-idp-shibboleth.xml
index a7c770af..074bef95 100644
--- a/swamid-2.0/shib-idp-2.oru.se-idp-shibboleth.xml
+++ b/swamid-2.0/shib-idp-2.oru.se-idp-shibboleth.xml
@@ -12,11 +12,21 @@
     <Extensions>
       <shibmd:Scope regexp="false">oru.se</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Örebro universitet</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider för Örebro universitet</mdui:Description>
+        <mdui:DisplayName xml:lang="sv">Örebro universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Örebro University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Örebro universitet</mdui:Description>
+        <mdui:Description xml:lang="en">Örebro University Identity Provider</mdui:Description>
+        <mdui:Keywords xml:lang="sv">ORU ORU.SE Örebro Orebro Orebro+universitet Örebro+University Orebro+university Örebro+universitet</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">ORU ORU.SE Örebro Orebro Orebro+universitet Örebro+University Orebro+university Örebro+universitet</mdui:Keywords>
         <mdui:PrivacyStatementURL xml:lang="sv">https://www.oru.se</mdui:PrivacyStatementURL>
         <mdui:Logo height="80" width="80">https://shib-idp-2.oru.se/Logo_txt_runt_farg.gif</mdui:Logo>
       </mdui:UIInfo>
+      <mdui:DiscoHints>
+        <mdui:DomainHint>oru.se</mdui:DomainHint>
+        <mdui:IPHint>130.243.96.0/19</mdui:IPHint>
+        <mdui:GeolocationHint>geo:59.2547,15.2485</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:59.7065,14.5473</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </Extensions>
     <KeyDescriptor use="signing">
       <ds:KeyInfo>
@@ -193,9 +203,27 @@ d3hB7quCN72lcAz/8iZU
     </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp-2.oru.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
   </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">ORU</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Örebro universitet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Örebro University</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.oru.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="administrative">
+    <Company>Örebro University</Company>
+    <SurName>IT Avdelningen</SurName>
+    <EmailAddress>mailto:itsupport@oru.se</EmailAddress>
+    <TelephoneNumber>+46 19 303166</TelephoneNumber>
+  </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>Örebro universitet</Company>
     <SurName>IT-support</SurName>
     <EmailAddress>itsupport@oru.se</EmailAddress>
   </ContactPerson>
+  <ContactPerson contactType="support">
+    <Company>Örebro University</Company>
+    <SurName>IT Avdelningen Örebro universitet</SurName>
+    <EmailAddress>mailto:itsupport@oru.se</EmailAddress>
+    <TelephoneNumber>+46 19 303166</TelephoneNumber>
+  </ContactPerson>
 </EntityDescriptor>
-- 
cgit v1.2.3