Resolves SWAMIDOPS-8146

4 files changed, 45 insertions, 19 deletions

diff --git a/swamid-2.0/idp.bth.se-idp-shibboleth.xml b/swamid-2.0/idp.bth.se-idp-shibboleth.xml
index 81028a94..9eb45784 100644
--- a/swamid-2.0/idp.bth.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.bth.se-idp-shibboleth.xml
@@ -4,10 +4,10 @@
     <Extensions>
       <shibmd:Scope regexp="false">bth.se</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Blekinge Tekniska Högskola - Personal</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Blekinge Institute of Technology - Personnel</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Blekinge Tekniska Högskola för personal</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Blekinge Institute of Technology for personnel</mdui:Description>
+        <mdui:DisplayName xml:lang="sv">Blekinge Tekniska Högskola - Personal - OLD</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Blekinge Institute of Technology - Personnel - OLD</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Blekinge Tekniska Högskola för personal - OLD</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Blekinge Institute of Technology for personnel - OLD</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.bth.se</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.bth.se/eng</mdui:InformationURL>
         <mdui:Keywords xml:lang="sv">BTH Blekinge+Tekniska+Högskola Blekinge+Institute+of+Technology</mdui:Keywords>
@@ -89,8 +89,8 @@ n9Phr4P3FEL3YKQK+xQiKCJXUb5WgRI=
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">BTH</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola - Personal</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Blekinge Institute of Technology - Personnel</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola - Personal - OLD</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Blekinge Institute of Technology - Personnel - OLD</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.bth.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
diff --git a/swamid-2.0/idp.student.bth.se-idp-shibboleth.xml b/swamid-2.0/idp.student.bth.se-idp-shibboleth.xml
index d7af3a09..23ba8562 100644
--- a/swamid-2.0/idp.student.bth.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.student.bth.se-idp-shibboleth.xml
@@ -4,10 +4,10 @@
     <Extensions>
       <shibmd:Scope regexp="false">bth.se</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Blekinge Tekniska Högskola - Studenter</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Blekinge Institute of Technology - Students</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Blekinge Tekniska Högskola för studenter</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Blekinge Institute of Technology for students</mdui:Description>
+        <mdui:DisplayName xml:lang="sv">Blekinge Tekniska Högskola - Studenter - OLD</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Blekinge Institute of Technology - Students - OLD</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Blekinge Tekniska Högskola för studenter - OLD</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Blekinge Institute of Technology for students - OLD</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.bth.se</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.bth.se/eng</mdui:InformationURL>
         <mdui:Keywords xml:lang="sv">Blekinge+Tekniska+Högskola BTH</mdui:Keywords>
@@ -85,8 +85,8 @@ nH4GzdNBUhBostxPfU/hk7XiQOMXNvgHzG2y53Vaa+RZPC45VHuFmyixxGFxktsF
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">STUDENTS-BTH</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola - Studenter</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Blekinge Institute of Technology - Students</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola - Studenter - OLD</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Blekinge Institute of Technology - Students - OLD</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.bth.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
diff --git a/swamid-2.0/idp2.bth.se-idp-shibboleth.xml b/swamid-2.0/idp2.bth.se-idp-shibboleth.xml
index 8f0feed6..d2ff808b 100644
--- a/swamid-2.0/idp2.bth.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp2.bth.se-idp-shibboleth.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-     This metadata is not dynamic - it will not change as your configuration changes.
--->
-<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://idp2.bth.se/idp/shibboleth">
+<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" entityID="https://idp2.bth.se/idp/shibboleth">
   <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">bth.se</shibmd:Scope>
-      <mdui:UIInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">Blekinge Tekniska Högskola</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Blekinge Institute of Technology</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för Blekinge Tekniska Högskola</mdui:Description>
@@ -15,10 +12,14 @@
         <mdui:InformationURL xml:lang="en">http://www.bth.se/eng</mdui:InformationURL>
         <mdui:Keywords xml:lang="sv">BTH Blekinge+Tekniska+Högskola Blekinge+Institute+of+Technology</mdui:Keywords>
         <mdui:Keywords xml:lang="en">BTH Blekinge+Tekniska+Högskola Blekinge+Institute+of+Technology</mdui:Keywords>
-        <mdui:Logo height="120" width="171">https://www2.bth.se/web2012/images/logo.png</mdui:Logo>
+        <mdui:Logo height="139" width="114">https://idp2.bth.se/idp/images/logo_bth.png</mdui:Logo>
       </mdui:UIInfo>
-      <mdui:DiscoHints>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DomainHint>bth.se</mdui:DomainHint>
+        <mdui:IPHint>193.11.184.0/21</mdui:IPHint>
+        <mdui:IPHint>194.47.128.0/19</mdui:IPHint>
+        <mdui:IPHint>2001:6b0:2a::/48</mdui:IPHint>
+        <mdui:GeolocationHint>geo:56.181775,15.590592</mdui:GeolocationHint>
       </mdui:DiscoHints>
     </Extensions>
     <KeyDescriptor use="signing">
@@ -185,4 +186,28 @@ KWto/xyUQbv82gswLTMa9y869J9X9IcMEYjVxg==
     </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.bth.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
   </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">BTH</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Blekinge Institute of Technology</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.bth.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="administrative">
+    <Company>Blekinge Institute of Technology</Company>
+    <SurName>IT Helpdesk</SurName>
+    <EmailAddress>mailto:ithelpdesk@bth.se</EmailAddress>
+    <TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <Company>Blekinge Institute of Technology</Company>
+    <SurName>IT Helpdesk</SurName>
+    <EmailAddress>mailto:ithelpdesk@bth.se</EmailAddress>
+    <TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <Company>Blekinge Institute of Technology</Company>
+    <SurName>IT Helpdesk</SurName>
+    <EmailAddress>mailto:ithelpdesk@bth.se</EmailAddress>
+    <TelephoneNumber>+46 455 381500</TelephoneNumber>
+  </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml
index 6998c838..ae3d78a2 100644
--- a/swamid-edugain-idp-1.0.mxml
+++ b/swamid-edugain-idp-1.0.mxml
@@ -52,4 +52,5 @@
   <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"/>
   <xi:include href="swamid-2.0/idpv3.lu.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp2.bth.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>