Merge branch 'master' of md-master.swamid.se:swamid-metadata

1 files changed, 28 insertions, 15 deletions

diff --git a/swamid-2.0/idp.hh.se-idp-shibboleth.xml b/swamid-2.0/idp.hh.se-idp-shibboleth.xml
index c3ca5a4d..424040df 100644
--- a/swamid-2.0/idp.hh.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.hh.se-idp-shibboleth.xml
@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-     This is example metadata only. Do *NOT* supply it as is without review,
-     and do *NOT* provide it in real time to your partners.
-
-     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://idp.hh.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">hh.se</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">idp.hh.se Shib 3 Test</mdui:DisplayName>
-        <mdui:Description xml:lang="en">idp.hh.se Shib 3 Test</mdui:Description>
+        <mdui:DisplayName xml:lang="sv">Högskolan i Halmstad (ny v3)</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Högskolan i Halmstad</mdui:Description>
+        <mdui:DisplayName xml:lang="en">Halmstad University (new v3)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for Halmstad University</mdui:Description>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor use="signing">
@@ -91,11 +87,6 @@ YpNyRSuI6t4ZdyVTy4B2kXQtVfo=
     </KeyDescriptor>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <!--
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hh.se/idp/profile/SAML2/Redirect/SLO"/>
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hh.se/idp/profile/SAML2/POST/SLO"/>
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hh.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-        -->
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
     <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hh.se/idp/profile/Shibboleth/SSO"/>
@@ -182,7 +173,29 @@ YpNyRSuI6t4ZdyVTy4B2kXQtVfo=
       </ds:KeyInfo>
     </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hh.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> -->
-    <!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
   </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">HH</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Högskolan i Halmstad (ny v3)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Halmstad University (new v3)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.hh.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="administrative">
+    <Company>Halmstad University</Company>
+    <SurName>Magnus Morén</SurName>
+    <EmailAddress>mailto:magnus.moren@hh.se</EmailAddress>
+    <TelephoneNumber>+46 35 167383</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <Company>Halmstad University</Company>
+    <SurName>Magnus Morén</SurName>
+    <EmailAddress>mailto:magnus.moren@hh.se</EmailAddress>
+    <TelephoneNumber>+46 35 167383</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <Company>Halmstad University</Company>
+    <SurName>Helpdesk Högskloan i Halmstad</SurName>
+    <EmailAddress>mailto:helpdesk@hh.se</EmailAddress>
+    <TelephoneNumber>+35 167800</TelephoneNumber>
+  </ContactPerson>
 </EntityDescriptor>