From 70d20169ff9983c7334a0278dae66fcd3bb3cc2f Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Wed, 30 May 2012 14:03:59 +0200
Subject: SWAMIDOPS-6565

---
 swamid-1.0/login.liu.se.xml | 49 ++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 44 insertions(+), 5 deletions(-)

(limited to 'swamid-1.0')

diff --git a/swamid-1.0/login.liu.se.xml b/swamid-1.0/login.liu.se.xml
index aaec920f..99ab49b5 100644
--- a/swamid-1.0/login.liu.se.xml
+++ b/swamid-1.0/login.liu.se.xml
@@ -1,9 +1,36 @@
-<EntityDescriptor entityID="https://login.liu.se/idp/shibboleth" 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:xml="http://www.w3.org/XML/1998/namespace">
+<EntityDescriptor entityID="https://login.liu.se/idp/shibboleth"
+                  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">
  
   <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">liu.se</shibmd:Scope>
+
+            <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+                <mdui:DisplayName xml:lang="sv">Linköpings universitet</mdui:DisplayName>
+                <mdui:DisplayName xml:lang="en">Linköping University</mdui:DisplayName>
+                <mdui:Description xml:lang="sv">Identitsutgivare för anställda och studenter vid Linköpings universitet.</mdui:Description>
+                <mdui:Description xml:lang="en">Identity Provider for employees and students at Linköping University.</mdui:Description>
+
+                <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:UIInfo>
+            <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+               <mdui:DomainHint>liu.se</mdui:DomainHint>
+               <mdui:IPHint>130.236.0.0/16</mdui:IPHint>
+               <mdui:IPHint>2001:6b0:17::/48</mdui:IPHint> 
+               <mdui:GeolocationHint>geo:58.397282,15.578624</mdui:GeolocationHint>
+            </mdui:DiscoHints>
         </Extensions>
 
         <KeyDescriptor>
@@ -93,14 +120,26 @@ dE1S/LL5o/3BCZXOh9Fuvm6ND4e+jSkCizMQNgm4iw==
    
   <Organization>
     <OrganizationName xml:lang="en">LiU</OrganizationName>
+    <OrganizationName xml:lang="sv">LiU</OrganizationName>
     <OrganizationDisplayName xml:lang="en">Linköping University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.liu.se</OrganizationURL>
+    <OrganizationDisplayName xml:lang="sv">Linköpings universitet</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.liu.se?l=en</OrganizationURL>
+    <OrganizationURL xml:lang="sv">http://www.liu.se?l=sv</OrganizationURL>
   </Organization>
+  <ContactPerson contactType="administrative">
+    <Company>Linköping University</Company>
+    <SurName>LiU-IT SAML admins</SurName>
+    <EmailAddress>saml-admins@liu.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <Company>Linköping University</Company>
+    <SurName>LiU-IT Helpdesk</SurName>
+    <EmailAddress>helpdesk@liu.se</EmailAddress>
+  </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>Linköping University</Company>
-    <GivenName>Markus</GivenName>
-    <SurName>Olausson</SurName>
-    <EmailAddress>markus.olausson@liu.se</EmailAddress>
+    <SurName>LiU-IT SAML admins</SurName>
+    <EmailAddress>saml-admins@liu.se</EmailAddress>
   </ContactPerson>
      
 </EntityDescriptor>
-- 
cgit v1.2.3