mdui updated for hv, liu and kth

SWAMIDOPS-7419

4 files changed, 25 insertions, 23 deletions

diff --git a/swamid-2.0/idp2.hv.se-idp-shibboleth.xml b/swamid-2.0/idp2.hv.se-idp-shibboleth.xml
index 1f0aab2a..6993b0fd 100644
--- a/swamid-2.0/idp2.hv.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp2.hv.se-idp-shibboleth.xml
@@ -10,13 +10,17 @@
         <mdui:Description xml:lang="en">Identity Provider for University West</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.hv.se</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.hv.se/en</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="103" width="200">http://www.hv.se/Media/GetImage/10228/395/2000/1117822E/Svensk%20logotyp%20200x103</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="103" width="200">http://www.hv.se/Media/GetImage/10230/395/2000/089F9216/Engelsk%20logotyp%20200x103</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="103" width="200">http://www.hv.se/Media/Get/17595/svensk-logotyp-200x103</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="103" width="200">http://www.hv.se/Media/Get/17597/3.-engelsk-logga.jpg</mdui:Logo>
         <mdui:Keywords xml:lang="sv">hv högskolan+väst university+west</mdui:Keywords>
         <mdui:Keywords xml:lang="en">hv högskolan+väst university+west</mdui:Keywords>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DomainHint>hv.se</mdui:DomainHint>
+        <mdui:IPHint>193.10.188.0/22</mdui:IPHint>
+        <mdui:IPHint>193.10.192.0/20</mdui:IPHint>
+        <mdui:IPHint>193.10.234.0/22</mdui:IPHint>
+        <mdui:IPHint>212.25.132.0/23</mdui:IPHint>
         <mdui:GeolocationHint>geo:58.2822,12.2934</mdui:GeolocationHint>
       </mdui:DiscoHints>
     </Extensions>
diff --git a/swamid-2.0/login.liu.se-idp-shibboleth.xml b/swamid-2.0/login.liu.se-idp-shibboleth.xml
index 453047d5..a331e59a 100644
--- a/swamid-2.0/login.liu.se-idp-shibboleth.xml
+++ b/swamid-2.0/login.liu.se-idp-shibboleth.xml
@@ -10,14 +10,9 @@
         <mdui:Description xml:lang="en">Identity Provider for employees and students at Linköping University.</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.liu.se/?l=sv</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.liu.se/?l=en</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" width="350" height="68">https://login.liu.se/idp/images/logo-350x68-sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" width="80" height="53">https://login.liu.se/idp/images/logo-80x53-sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" width="50" height="50">https://login.liu.se/idp/images/logo-50x50.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" width="16" height="16">https://login.liu.se/idp/images/logo-16x16.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" width="350" height="68">https://login.liu.se/idp/images/logo-350x68-en.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" width="80" height="53">https://login.liu.se/idp/images/logo-80x53-en.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" width="50" height="50">https://login.liu.se/idp/images/logo-50x50.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" width="16" height="16">https://login.liu.se/idp/images/logo-16x16.png</mdui:Logo>
+        <mdui:Logo height="68" width="350">https://login.liu.se/idp/images/logo-350x68-sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="68" width="350">https://login.liu.se/idp/images/logo-350x68-sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="68" width="350">https://login.liu.se/idp/images/logo-350x68-en.png</mdui:Logo>
         <mdui:Keywords xml:lang="sv">liu linkopings+universitet linkoping+university</mdui:Keywords>
         <mdui:Keywords xml:lang="en">liu linkopings+universitet linkoping+university</mdui:Keywords>
       </mdui:UIInfo>
@@ -120,5 +115,6 @@ dE1S/LL5o/3BCZXOh9Fuvm6ND4e+jSkCizMQNgm4iw==
     <Company>Linköping University</Company>
     <SurName>LiU-IT Helpdesk</SurName>
     <EmailAddress>helpdesk@liu.se</EmailAddress>
+    <TelephoneNumber>+46 13 282828</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/saml-1.sys.kth.se-idp-shibboleth.xml b/swamid-2.0/saml-1.sys.kth.se-idp-shibboleth.xml
index f179e8ee..e3c1dda0 100644
--- a/swamid-2.0/saml-1.sys.kth.se-idp-shibboleth.xml
+++ b/swamid-2.0/saml-1.sys.kth.se-idp-shibboleth.xml
@@ -4,15 +4,15 @@
     <Extensions>
       <shibmd:Scope regexp="false">kth.se</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Kungliga Tekniska Högskolan (KTH)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">KTH Royal Institute of Technology</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Kungliga Tekniska Högskolan (old)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">KTH Royal Institute of Technology (old)</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för KTH</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for KTH</mdui:Description>
         <mdui:InformationURL xml:lang="sv">https://www.kth.se/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://www.kth.se/en</mdui:InformationURL>
         <mdui:Logo height="82" width="82">https://saml-1.sys.kth.se/logo-main.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">kth kungliga+tekniska+högskolan kungliga+tekniska+hogskolan royal+institute+of+technology stockholm</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">kth kungliga+tekniska+högskolan kungliga+tekniska+hogskolan royal+institute+of+technology stockholm</mdui:Keywords>
+        <mdui:Keywords xml:lang="sv">stockholm</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">stockholm</mdui:Keywords>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DomainHint>kth.se</mdui:DomainHint>
@@ -121,19 +121,19 @@ sdhdXg==
     <OrganizationURL xml:lang="en">http://www.kth.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
-    <Company>KTH Royal Institute of Technology</Company>
+    <Company>KTH Royal Institute of Technology (old)</Company>
     <SurName>UF/ITA Infra (Alexander Boström, Hans Berggren, Jonas Andersson)</SurName>
     <EmailAddress>ita-infra-saml-contact@kth.se</EmailAddress>
     <TelephoneNumber>+46 8 790 6000</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="technical">
-    <Company>KTH Royal Institute of Technology</Company>
+    <Company>KTH Royal Institute of Technology (old)</Company>
     <SurName>UF/ITA Infra (Alexander Boström, Hans Berggren, Jonas Andersson)</SurName>
     <EmailAddress>ita-infra-saml-contact@kth.se</EmailAddress>
     <TelephoneNumber>+46 8 790 6000</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
-    <Company>KTH Royal Institute of Technology</Company>
+    <Company>KTH Royal Institute of Technology (old)</Company>
     <SurName>KTH IT-Support</SurName>
     <EmailAddress>it-support@kth.se</EmailAddress>
     <TelephoneNumber>+46 8 790 6600</TelephoneNumber>
diff --git a/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml b/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml
index 6fd955e3..34ffc5e1 100644
--- a/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml
+++ b/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml
@@ -11,13 +11,15 @@
     <Extensions>
       <shibmd:Scope regexp="false">kth.se</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Kungliga Tekniska högskolan (test)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">KTH Royal Institute of Technology (test)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Kungliga Tekniska högskolan (KTH)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">KTH Royal Institute of Technology</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för KTH</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for KTH</mdui:Description>
         <mdui:InformationURL xml:lang="sv">https://www.kth.se/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://www.kth.se/en</mdui:InformationURL>
-        <mdui:Logo height="225" width="225">https://saml-2.sys.kth.se/idp/images/logo.png</mdui:Logo>
+        <mdui:Logo height="166" width="166">https://saml.sys.kth.se/idp/images/logo.png</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">stockholm</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">stockholm</mdui:Keywords>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DomainHint>kth.se</mdui:DomainHint>
@@ -123,19 +125,19 @@ x7JUFw==</ds:X509Certificate>
     <OrganizationURL xml:lang="en">http://www.kth.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
-    <Company>KTH Royal Institute of Technology (test)</Company>
+    <Company>KTH Royal Institute of Technology</Company>
     <SurName>UF/ITA Infra (Alexander Boström, Hans Berggren, Jonas Andersson)</SurName>
     <EmailAddress>ita-infra-saml-contact@kth.se</EmailAddress>
     <TelephoneNumber>+46 8 790 6000</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="technical">
-    <Company>KTH Royal Institute of Technology (test)</Company>
+    <Company>KTH Royal Institute of Technology</Company>
     <SurName>UF/ITA Infra (Alexander Boström, Hans Berggren, Jonas Andersson)</SurName>
     <EmailAddress>ita-infra-saml-contact@kth.se</EmailAddress>
     <TelephoneNumber>+46 8 790 6000</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
-    <Company>KTH Royal Institute of Technology (test)</Company>
+    <Company>KTH Royal Institute of Technology</Company>
     <SurName>KTH IT-Support</SurName>
     <EmailAddress>it-support@kth.se</EmailAddress>
     <TelephoneNumber>+46 8 790 6600</TelephoneNumber>