Resolved SWAMID-310

6 files changed, 39 insertions, 40 deletions

diff --git a/swamid-2.0/indico.uu.se-shibboleth.xml b/swamid-2.0/indico.uu.se-shibboleth.xml
index 454167f1..881b1111 100644
--- a/swamid-2.0/indico.uu.se-shibboleth.xml
+++ b/swamid-2.0/indico.uu.se-shibboleth.xml
@@ -105,22 +105,18 @@ S8+ySBPOBAlDD/+hnhDiWa82S9gWdmu9m9eFNZhK65BrqXq6ogD9wpznTB/+AbQ=
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uu.se/en</md:OrganizationURL>
+    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">http://www.uu.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
-    <md:GivenName>Björn</md:GivenName>
-    <md:SurName>Wiberg</md:SurName>
-    <md:EmailAddress>mailto:bjorn.wiberg@uadm.uu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:indico-datordrift@its.uu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>Björn</md:GivenName>
-    <md:SurName>Wiberg</md:SurName>
-    <md:EmailAddress>mailto:bjorn.wiberg@uadm.uu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:indico-datordrift@its.uu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <md:GivenName>Uppsala University Computer Security Incident Response Team</md:GivenName>
diff --git a/swamid-2.0/konto.test.uu.se-shibboleth.xml b/swamid-2.0/konto.test.uu.se-shibboleth.xml
index 2b17ad96..db3f7772 100644
--- a/swamid-2.0/konto.test.uu.se-shibboleth.xml
+++ b/swamid-2.0/konto.test.uu.se-shibboleth.xml
@@ -50,14 +50,16 @@ Lf3VcAZi+NsypUL4nVwgn6iHbsaXGfTZPispp6rXJ48r/XnBFQ==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://konto.test.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Uppsala universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uu.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>IT Servicedesk</md:SurName>
-    <md:EmailAddress>helpdesk@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 18 4714400</md:TelephoneNumber>
+    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46184714400</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/konto.weblogin.uu.se-shibboleth.xml b/swamid-2.0/konto.weblogin.uu.se-shibboleth.xml
index fa2bfd7d..56e7a5d5 100644
--- a/swamid-2.0/konto.weblogin.uu.se-shibboleth.xml
+++ b/swamid-2.0/konto.weblogin.uu.se-shibboleth.xml
@@ -57,14 +57,16 @@ zs343t8msFatMz3jlO+DgmZS0btlHkYSvRDAGaXOAkwGnE3nzjsLKA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://konto.weblogin.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Uppsala universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uu.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>IT Servicedesk</md:SurName>
-    <md:EmailAddress>helpdesk@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 18 4714400</md:TelephoneNumber>
+    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46184714400</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/primulaweb.uadm.uu.se-shibboleth.xml b/swamid-2.0/primulaweb.uadm.uu.se-shibboleth.xml
index 4ad65910..24fb8685 100644
--- a/swamid-2.0/primulaweb.uadm.uu.se-shibboleth.xml
+++ b/swamid-2.0/primulaweb.uadm.uu.se-shibboleth.xml
@@ -54,14 +54,16 @@ sSTegEDIGBp64fKxe6vEUaUKq8V9q/QGutnM87N8ZX39uYeNoUsxyA==
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://primulaweb.uadm.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
   </SPSSODescriptor>
   <Organization>
-    <OrganizationName xml:lang="en">Uppsala universitet</OrganizationName>
+    <OrganizationName xml:lang="sv">Uppsala universitet</OrganizationName>
+    <OrganizationName xml:lang="en">Uppsala University</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Uppsala universitet</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Uppsala University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uu.se</OrganizationURL>
+    <OrganizationURL xml:lang="sv">http://www.uu.se/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.uu.se/en/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="support">
     <Company>Uppsala universitet</Company>
-    <SurName>IT Servicedesk</SurName>
-    <EmailAddress>helpdesk@uu.se</EmailAddress>
-    <TelephoneNumber>+46 18 4714400</TelephoneNumber>
+    <EmailAddress>mailto:servicedesk@uu.se</EmailAddress>
+    <TelephoneNumber>+46184714400</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/stipendier.uu.se-stipendium.xml b/swamid-2.0/stipendier.uu.se-stipendium.xml
index cdf1d8b9..3a86f863 100644
--- a/swamid-2.0/stipendier.uu.se-stipendium.xml
+++ b/swamid-2.0/stipendier.uu.se-stipendium.xml
@@ -63,7 +63,7 @@
     <md:AssertionConsumerService xmlns:hoksso="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://stipendier.uu.se:443/stipendium/saml/HoKSSO/alias/defaultAlias" hoksso:ProtocolBinding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="4"/>
   </md:SPSSODescriptor>
   <md:ContactPerson contactType="administrative">
-    <md:GivenName>Magnus</md:GivenName>
+    <md:GivenName>Tommy</md:GivenName>
     <md:SurName>Stenvi</md:SurName>
     <md:EmailAddress>mailto:tommy.stenvi@uadm.uu.se</md:EmailAddress>
   </md:ContactPerson>
diff --git a/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml b/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml
index 16f4f952..3c3cf88c 100644
--- a/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml
+++ b/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml
@@ -218,31 +218,28 @@ nQPiHsyW3apD4+IJzI2nGQfeL4XO6MPUPVvn+7TiduFaCe+TXJQW
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
   </AttributeAuthorityDescriptor>
   <Organization>
-    <OrganizationName xml:lang="en">UU</OrganizationName>
+    <OrganizationName xml:lang="sv">Uppsala universitet</OrganizationName>
+    <OrganizationName xml:lang="en">Uppsala University</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Uppsala universitet</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Uppsala University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uu.se</OrganizationURL>
+    <OrganizationURL xml:lang="sv">http://www.uu.se/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.uu.se/en/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
-    <Company>Uppsala University</Company>
-    <SurName>SAML2 admins</SurName>
-    <EmailAddress>mailto:uadm-team_plattform@lists.uu.se</EmailAddress>
-    <TelephoneNumber>+46 70 425 0477</TelephoneNumber>
+    <Company>Uppsala universitet</Company>
+    <EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="technical">
-    <Company>Uppsala University</Company>
-    <SurName>John Morrison</SurName>
-    <EmailAddress>mailto:john.morrison@uadm.uu.se</EmailAddress>
-    <TelephoneNumber>+46 70 425 0477</TelephoneNumber>
+    <Company>Uppsala universitet</Company>
+    <EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="support">
-    <Company>Uppsala University</Company>
-    <SurName>Helpdesk</SurName>
-    <EmailAddress>mailto:helpdesk@uu.se</EmailAddress>
-    <TelephoneNumber>+46184717890</TelephoneNumber>
+    <Company>Uppsala universitet</Company>
+    <EmailAddress>mailto:servicedesk@uu.se</EmailAddress>
+    <TelephoneNumber>+46184714400</TelephoneNumber>
   </ContactPerson>
   <ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <GivenName>IT Security Response Team</GivenName>
+    <GivenName>Uppsala University Computer Security Incident Response Team</GivenName>
     <EmailAddress>mailto:security@uu.se</EmailAddress>
     <TelephoneNumber>+46184717560</TelephoneNumber>
   </ContactPerson>