mdui and contactperson for slu and ltu

3 files changed, 47 insertions, 10 deletions

diff --git a/swamid-2.0/calypso.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/calypso.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 1bc61421..92942fc0 100644
--- a/swamid-2.0/calypso.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/calypso.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -21,14 +21,14 @@
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
-<ds:X509Data>
+        <ds:X509Data>
           <ds:X509Certificate>MIIDjTCCAnWgAwIBAgIJALrWD/oF6AqTMA0GCSqGSIb3DQEBBQUAMF0xCzAJBgNVBAYTAlNFMREwDwYDVQQHDAhLYXJsc3RhZDEeMBwGA1UECgwVS2FybHN0YWRzIHVuaXZlcnNpdGV0MRswGQYDVQQDDBJjYWx5cHNvLnNhdS5rYXUuc2UwHhcNMTQwNDA4MTExNzA2WhcNMjQwNDA3MTExNzA2WjBdMQswCQYDVQQGEwJTRTERMA8GA1UEBwwIS2FybHN0YWQxHjAcBgNVBAoMFUthcmxzdGFkcyB1bml2ZXJzaXRldDEbMBkGA1UEAwwSY2FseXBzby5zYXUua2F1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArMTLwS2CWEp1NOD6GODjP8Dj5Kk4PWmGHIYgGrsnSp1pnUNk8NXbwWjmdaDoyGv7Pv4B4rjUSUmribs8AlZe8fY3URQ2AYMNL2sorUZAZapZydReI9cFXmFMpV3/i8Sb3RbJEvnds6vcva8NlAKKqWv7muagM+UN1PIctaZW7E48yTX8GpPbDwSDNQH4RtFySvt38Pygk94qLdaexJVnRmZJlROvJFOK9jYyRYrDkN5c3YZ2ey5/oxSIkuFq41X51Aae6RB9cEibAqaCU4vRgaZ3Wba/ae+He3mPXYxLky9PMu30TJrEjzIkyBTFThM0c+TivN1Lyi7aep9VPN1cFwIDAQABo1AwTjAdBgNVHQ4EFgQUd46kTnx1eNp70tfGcx6rQeICpq0wHwYDVR0jBBgwFoAUd46kTnx1eNp70tfGcx6rQeICpq0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAikiUo+44ia/APaTs5SZbW8tK078/JUjvLvkngBdM8bF4SaYZX7aaQCCKb7Isi/ShYNG97+MPTQlUT7gGaEPR+QFHaGlA8yi5GOG9YNMZU3ceFC8ZPGfaF45w/MYd2LtXd7tcK/A5/GxM3CAbDois9RzX6r6yYabrRsq3tGiaJXs6dtsmMz4HzSEVnxoDGegoXKJNC8OkDIHYMP8IODIuOLWL8RMnhGlu3fr/NqWsR5I166bTdiaFlO9fY+F70smfghBIHjmsSFD8n6AEFeg6HV/AIXyWaRfXwKlP5/S1uZT1wtq2xyzI+5E1gmeT4PTqGarE+bq+BVoMm0EVWy2kag==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
-<ds:X509Data>
+        <ds:X509Data>
           <ds:X509Certificate>MIIDjTCCAnWgAwIBAgIJALrWD/oF6AqTMA0GCSqGSIb3DQEBBQUAMF0xCzAJBgNVBAYTAlNFMREwDwYDVQQHDAhLYXJsc3RhZDEeMBwGA1UECgwVS2FybHN0YWRzIHVuaXZlcnNpdGV0MRswGQYDVQQDDBJjYWx5cHNvLnNhdS5rYXUuc2UwHhcNMTQwNDA4MTExNzA2WhcNMjQwNDA3MTExNzA2WjBdMQswCQYDVQQGEwJTRTERMA8GA1UEBwwIS2FybHN0YWQxHjAcBgNVBAoMFUthcmxzdGFkcyB1bml2ZXJzaXRldDEbMBkGA1UEAwwSY2FseXBzby5zYXUua2F1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArMTLwS2CWEp1NOD6GODjP8Dj5Kk4PWmGHIYgGrsnSp1pnUNk8NXbwWjmdaDoyGv7Pv4B4rjUSUmribs8AlZe8fY3URQ2AYMNL2sorUZAZapZydReI9cFXmFMpV3/i8Sb3RbJEvnds6vcva8NlAKKqWv7muagM+UN1PIctaZW7E48yTX8GpPbDwSDNQH4RtFySvt38Pygk94qLdaexJVnRmZJlROvJFOK9jYyRYrDkN5c3YZ2ey5/oxSIkuFq41X51Aae6RB9cEibAqaCU4vRgaZ3Wba/ae+He3mPXYxLky9PMu30TJrEjzIkyBTFThM0c+TivN1Lyi7aep9VPN1cFwIDAQABo1AwTjAdBgNVHQ4EFgQUd46kTnx1eNp70tfGcx6rQeICpq0wHwYDVR0jBBgwFoAUd46kTnx1eNp70tfGcx6rQeICpq0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAikiUo+44ia/APaTs5SZbW8tK078/JUjvLvkngBdM8bF4SaYZX7aaQCCKb7Isi/ShYNG97+MPTQlUT7gGaEPR+QFHaGlA8yi5GOG9YNMZU3ceFC8ZPGfaF45w/MYd2LtXd7tcK/A5/GxM3CAbDois9RzX6r6yYabrRsq3tGiaJXs6dtsmMz4HzSEVnxoDGegoXKJNC8OkDIHYMP8IODIuOLWL8RMnhGlu3fr/NqWsR5I166bTdiaFlO9fY+F70smfghBIHjmsSFD8n6AEFeg6HV/AIXyWaRfXwKlP5/S1uZT1wtq2xyzI+5E1gmeT4PTqGarE+bq+BVoMm0EVWy2kag==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-2.0/idp2-1.slu.se-idp-shibboleth.xml b/swamid-2.0/idp2-1.slu.se-idp-shibboleth.xml
index 447abad7..672b7907 100644
--- a/swamid-2.0/idp2-1.slu.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp2-1.slu.se-idp-shibboleth.xml
@@ -8,9 +8,14 @@
         <mdui:DisplayName xml:lang="en">Swedish University of Agricultural Science</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för Sveriges Lantbruksuniversitet.</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for Swedish University of Agricultural Science</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.slu.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.slu.se/en/</mdui:InformationURL>
         <mdui:Logo height="100" width="100">https://idp2-1.slu.se/info/images/slu_logotyp_web_100.png</mdui:Logo>
         <mdui:Logo height="16" width="16">https://idp2-1.slu.se/info/images/slu_logotyp_web_16.png</mdui:Logo>
       </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>slu.se</mdui:DomainHint>
+      </mdui:DiscoHints>
     </Extensions>
     <KeyDescriptor>
       <ds:KeyInfo>
@@ -82,16 +87,22 @@ o04ltBnMhQ==</ds:X509Certificate>
     <OrganizationDisplayName xml:lang="en">Swedish University of Agricultural Science</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.slu.se/en/</OrganizationURL>
   </Organization>
-  <ContactPerson xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>SAML Admins</GivenName>
+  <ContactPerson contactType="administrative">
+    <Company>Swedish University of Agricultural Science</Company>
+    <SurName>Bengt Norman</SurName>
     <EmailAddress>saml-admins@slu.se</EmailAddress>
+    <TelephoneNumber>+46 90 786 81 22</TelephoneNumber>
   </ContactPerson>
-  <ContactPerson xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <GivenName>SAML Admins</GivenName>
+  <ContactPerson contactType="technical">
+    <Company>Swedish University of Agricultural Science</Company>
+    <SurName>Ivan Clegg</SurName>
     <EmailAddress>saml-admins@slu.se</EmailAddress>
+    <TelephoneNumber>+46 70 2413737</TelephoneNumber>
   </ContactPerson>
-  <ContactPerson xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <GivenName>Help Desk</GivenName>
+  <ContactPerson contactType="support">
+    <Company>Swedish University of Agricultural Science</Company>
+    <SurName>IT-stöd</SurName>
     <EmailAddress>mailto:IT-stod@slu.se</EmailAddress>
+    <TelephoneNumber>+46 18 67 66 00</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml b/swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml
index 1ff4fbe1..72f8ec04 100644
--- a/swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml
+++ b/swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml
@@ -3,6 +3,18 @@
   <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">ltu.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Luleå tekniska universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Lulea University of Technology</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Luleå tekniska universitet</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Lulea University of Technology</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.ltu.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.ltu.se/?l=en</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>ltu.se</mdui:DomainHint>
+        <mdui:IPHint>130.240.0.0/16</mdui:IPHint>
+      </mdui:DiscoHints>
     </Extensions>
     <KeyDescriptor>
       <ds:KeyInfo>
@@ -80,8 +92,22 @@ B2BEejurB8CAdtQkwfCKCSFl7spaJzSGPq/dt4yO4qSslJA=
     <OrganizationDisplayName xml:lang="en">Luleå Tekniska Universitet</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.ltu.se</OrganizationURL>
   </Organization>
+  <ContactPerson contactType="administrative">
+    <Company>Lulea University of Technology</Company>
+    <SurName>LTU Servicedesk</SurName>
+    <EmailAddress>its-idp@list.ltu.se</EmailAddress>
+    <TelephoneNumber>+46 920 491664</TelephoneNumber>
+  </ContactPerson>
   <ContactPerson contactType="technical">
-    <Company>Luleå tekniska universitet</Company>
-    <EmailAddress>Magnus.Jacobsson@ltu.se</EmailAddress>
+    <Company>Lulea University of Technology</Company>
+    <SurName>LTU Servicedesk</SurName>
+    <EmailAddress>its-idp@list.ltu.se</EmailAddress>
+    <TelephoneNumber>+46 920 491664</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <Company>Lulea University of Technology</Company>
+    <SurName>LTU Servicedesk</SurName>
+    <EmailAddress>its-idp@list.ltu.se</EmailAddress>
+    <TelephoneNumber>+46 920 491664</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>