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

6 files changed, 147 insertions, 90 deletions

diff --git a/swamid-2.0/rehab.test.uu.se-TicketServer-.xml b/swamid-2.0/rehab.test.uu.se-TicketServer-.xml
new file mode 100644
index 00000000..c8d059ac
--- /dev/null
+++ b/swamid-2.0/rehab.test.uu.se-TicketServer-.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://rehab.test.uu.se/TicketServer/">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-06-03T16:33:58Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true" WantAssertionsSigned="true">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Adato Rehab Test</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Adato Rehab Test</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Uppsala universitets system för rehabiliteringsärenden (TEST-VERSION).</mdui:Description>
+        <mdui:Description xml:lang="en">Uppsala University system for workplace rehabilitation (TEST VERSION).</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://mp.uu.se/c/perm/link?p=594622498&amp;l=sv</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://mp.uu.se/c/perm/link?p=594622498&amp;l=en</mdui:InformationURL>
+        <mdui:Logo height="50" width="50" xml:lang="sv">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <mdui:Logo height="50" width="50" xml:lang="en">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">https://mp.uu.se/c/perm/link?p=767069827&amp;l=en</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://mp.uu.se/c/perm/link?p=767069827&amp;l=sv</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>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</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rehab.test.uu.se/TicketServer/SAML/SAMLAssert.aspx" index="0" isDefault="true"/>
+  </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="sv">Uppsala universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>HR-avdelningen</md:GivenName>
+    <md:EmailAddress>mailto:hr-ufv@uadm.uu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Grupp system Windows</md:GivenName>
+    <md:EmailAddress>mailto:itsupport@uu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>HR-avdelningen</md:GivenName>
+    <md:EmailAddress>mailto:itsupport@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>
+    <md:EmailAddress>mailto:security@uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46-18-4717560</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/rehab.test.uu.se-ticketserver-.xml b/swamid-2.0/rehab.test.uu.se-ticketserver-.xml
deleted file mode 100644
index bf467ef4..00000000
--- a/swamid-2.0/rehab.test.uu.se-ticketserver-.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://rehab.test.uu.se/TicketServer/">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-06-03T16:33:58Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true" WantAssertionsSigned="true">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Adato Rehab Test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Adato Rehab Test</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Uppsala universitets system för rehabiliteringsärenden (TEST-VERSION).</mdui:Description>
-        <mdui:Description xml:lang="en">Uppsala University system for workplace rehabilitation (TEST VERSION).</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://mp.uu.se/c/perm/link?p=594622498&amp;l=sv</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://mp.uu.se/c/perm/link?p=594622498&amp;l=en</mdui:InformationURL>
-        <mdui:Logo height="50" width="50" xml:lang="sv">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-        <mdui:Logo height="50" width="50" xml:lang="en">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>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</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rehab.test.uu.se/TicketServer/SAML/SAMLAssert.aspx" index="0" isDefault="true"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>HR-avdelningen</md:GivenName>
-    <md:EmailAddress>mailto:hr-ufv@uadm.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Grupp system Windows</md:GivenName>
-    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>HR-avdelningen</md:GivenName>
-    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/rehab.uu.se-TicketServer-.xml b/swamid-2.0/rehab.uu.se-TicketServer-.xml
new file mode 100644
index 00000000..4bec4180
--- /dev/null
+++ b/swamid-2.0/rehab.uu.se-TicketServer-.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://rehab.uu.se/TicketServer/">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-05-19T18:01:33Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true" WantAssertionsSigned="true">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Adato Rehab</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Adato Rehab</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Uppsala universitets system för rehabiliteringsärenden.</mdui:Description>
+        <mdui:Description xml:lang="en">Uppsala University system for workplace rehabilitation.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://mp.uu.se/c/perm/link?p=594622498&amp;l=sv</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://mp.uu.se/c/perm/link?p=594622498&amp;l=en</mdui:InformationURL>
+        <mdui:Logo height="50" width="50" xml:lang="sv">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <mdui:Logo height="50" width="50" xml:lang="en">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">https://mp.uu.se/c/perm/link?p=767069827&amp;l=en</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://mp.uu.se/c/perm/link?p=767069827&amp;l=sv</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDqDCCApACCQCYZVibRnPytjANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMCU0UxEDAOBgNVBAgMB1VwcHNhbGExEDAOBgNVBAcMB1VwcHNhbGExHDAaBgNVBAoME1VwcHNhbGEgdW5pdmVyc2l0ZXQxDDAKBgNVBAsMA1VJVDEUMBIGA1UEAwwLcmVoYWIudXUuc2UxIDAeBgkqhkiG9w0BCQEWEXNlcnZpY2VkZXNrQHV1LnNlMB4XDTIxMDQxNjEyNTQ0M1oXDTQ2MDQxMDEyNTQ0M1owgZUxCzAJBgNVBAYTAlNFMRAwDgYDVQQIDAdVcHBzYWxhMRAwDgYDVQQHDAdVcHBzYWxhMRwwGgYDVQQKDBNVcHBzYWxhIHVuaXZlcnNpdGV0MQwwCgYDVQQLDANVSVQxFDASBgNVBAMMC3JlaGFiLnV1LnNlMSAwHgYJKoZIhvcNAQkBFhFzZXJ2aWNlZGVza0B1dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMHP61fB010kXutw0CzcvDA6Z8eIayEF26QdILSBn/wwuLahIun3BlpyHM7rxMaB4jpKaFLdKJ9F5d4ON5WQn3KdrG6IU/8ZAfqAGQMYeegtaiXvSRvfoRVjQvDhmREXw/rrrhAkajg20jKQ5M6ALB7VakhRwNPLcuDUq/BwMv7/A6cccxep1jyp2EYmjC+hAu2aFvHvYZQUPtukkYrJ9l1NthQwldRVQScULZt7cVOsnlqE5Sv9j6c8NtT9ILGx7SQYqDj6utUV7cK9NnEkXLJiGvV1+Vr5pMVrChvafunVvpRsdfUDN1UuqYFNR/otaU8FjIro+k/CvwQ3WOMqR98CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAwXEiY76PJ9tmDBhn4YTj3Ct1OVKIgXqCs+I9DG4CkCDUJceqSA5mZFiERsG0FBYQxjmKmM+JBEPyF0Q8EK1W3Dbo643RuuPOw59C488TbprNVnzeysUNIo6/TFan004TXfZ/pa/HDuJxP+pMeN8cJvcLFHdmvLi5Y1aJrStM4os68TMNu4dRadAjUsnWURKPozOG5eioWEWcBTLfqc/elpMAM7DCHh2SSxaENlZ3eRlYlUq+I9rtmMWeYG4mgrDBTNpt5shMo75vvRERtG95jl8TBCJiHZjp4DVqDgzbJa0wzH+OdyffbVvoHaSQYDTBY118ngc9R+QNgvtQqqu0EA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rehab.uu.se/TicketServer/SAML/SAMLAssert.aspx" index="0" isDefault="true"/>
+  </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="sv">Uppsala universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>HR-avdelningen</md:GivenName>
+    <md:EmailAddress>mailto:hr-ufv@uadm.uu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Grupp system Windows</md:GivenName>
+    <md:EmailAddress>mailto:itsupport@uu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>HR-avdelningen</md:GivenName>
+    <md:EmailAddress>mailto:itsupport@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>
+    <md:EmailAddress>mailto:security@uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46-18-4717560</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/rehab.uu.se-ticketserver-.xml b/swamid-2.0/rehab.uu.se-ticketserver-.xml
deleted file mode 100644
index e03c71ad..00000000
--- a/swamid-2.0/rehab.uu.se-ticketserver-.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://rehab.uu.se/TicketServer/">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-05-19T18:01:33Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true" WantAssertionsSigned="true">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Adato Rehab</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Adato Rehab</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Uppsala universitets system för rehabiliteringsärenden.</mdui:Description>
-        <mdui:Description xml:lang="en">Uppsala University system for workplace rehabilitation.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://mp.uu.se/c/perm/link?p=594622498&amp;l=sv</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://mp.uu.se/c/perm/link?p=594622498&amp;l=en</mdui:InformationURL>
-        <mdui:Logo height="50" width="50" xml:lang="sv">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-        <mdui:Logo height="50" width="50" xml:lang="en">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIDqDCCApACCQCYZVibRnPytjANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMCU0UxEDAOBgNVBAgMB1VwcHNhbGExEDAOBgNVBAcMB1VwcHNhbGExHDAaBgNVBAoME1VwcHNhbGEgdW5pdmVyc2l0ZXQxDDAKBgNVBAsMA1VJVDEUMBIGA1UEAwwLcmVoYWIudXUuc2UxIDAeBgkqhkiG9w0BCQEWEXNlcnZpY2VkZXNrQHV1LnNlMB4XDTIxMDQxNjEyNTQ0M1oXDTQ2MDQxMDEyNTQ0M1owgZUxCzAJBgNVBAYTAlNFMRAwDgYDVQQIDAdVcHBzYWxhMRAwDgYDVQQHDAdVcHBzYWxhMRwwGgYDVQQKDBNVcHBzYWxhIHVuaXZlcnNpdGV0MQwwCgYDVQQLDANVSVQxFDASBgNVBAMMC3JlaGFiLnV1LnNlMSAwHgYJKoZIhvcNAQkBFhFzZXJ2aWNlZGVza0B1dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMHP61fB010kXutw0CzcvDA6Z8eIayEF26QdILSBn/wwuLahIun3BlpyHM7rxMaB4jpKaFLdKJ9F5d4ON5WQn3KdrG6IU/8ZAfqAGQMYeegtaiXvSRvfoRVjQvDhmREXw/rrrhAkajg20jKQ5M6ALB7VakhRwNPLcuDUq/BwMv7/A6cccxep1jyp2EYmjC+hAu2aFvHvYZQUPtukkYrJ9l1NthQwldRVQScULZt7cVOsnlqE5Sv9j6c8NtT9ILGx7SQYqDj6utUV7cK9NnEkXLJiGvV1+Vr5pMVrChvafunVvpRsdfUDN1UuqYFNR/otaU8FjIro+k/CvwQ3WOMqR98CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAwXEiY76PJ9tmDBhn4YTj3Ct1OVKIgXqCs+I9DG4CkCDUJceqSA5mZFiERsG0FBYQxjmKmM+JBEPyF0Q8EK1W3Dbo643RuuPOw59C488TbprNVnzeysUNIo6/TFan004TXfZ/pa/HDuJxP+pMeN8cJvcLFHdmvLi5Y1aJrStM4os68TMNu4dRadAjUsnWURKPozOG5eioWEWcBTLfqc/elpMAM7DCHh2SSxaENlZ3eRlYlUq+I9rtmMWeYG4mgrDBTNpt5shMo75vvRERtG95jl8TBCJiHZjp4DVqDgzbJa0wzH+OdyffbVvoHaSQYDTBY118ngc9R+QNgvtQqqu0EA==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rehab.uu.se/TicketServer/SAML/SAMLAssert.aspx" index="0" isDefault="true"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>HR-avdelningen</md:GivenName>
-    <md:EmailAddress>mailto:hr-ufv@uadm.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Grupp system Windows</md:GivenName>
-    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>HR-avdelningen</md:GivenName>
-    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/test-hkr.hr.evry.se-shibboleth.xml b/swamid-2.0/test-hkr.hr.evry.se-shibboleth.xml
index 2fd44120..42a9ff33 100644
--- a/swamid-2.0/test-hkr.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/test-hkr.hr.evry.se-shibboleth.xml
@@ -17,6 +17,18 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Primula test</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Primula test</mdui:DisplayName>
+        <mdui:Description xml:lang="en">TEST The web interface to the HR software system Primula from EVRY HR Solutions AB for employees at Kristianstad University</mdui:Description>
+        <mdui:Description xml:lang="sv">TEST Webgränssnittet till HR-systemet Primula från EVRY HR Solutions AB för anställda vid Högskolan Kristianstad</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.statenssc.se/om-statens-servicecenter</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.statenssc.se/om-statens-servicecenter</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.statenssc.se/omstatensservicecenter/personuppgifter/federeradinloggning</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.statenssc.se/omstatensservicecenter/personuppgifter/federeradinloggning</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
@@ -54,19 +66,34 @@ tFtOy/01MRdVsQQc8spn2VX6WxZsXCj1HNHrT91JARliVf+ztavCB3DOxSE=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:browser-post" Location="https://test-hkr.hr.evry.se/Shibboleth.sso/SAML2/POST" index="6"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">Primula Web</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eppn" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="affiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:ServiceName xml:lang="sv">Primula Web</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
       <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Evry HR Solutions AB</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Evry HR Solutions AB</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Evry HR Solutions AB</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Evry HR Solutions AB</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.evry.se/it-tjanster/applikationstjanster-och-losningar/personal-och-lonesystem/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.evry.se/it-tjanster/applikationstjanster-och-losningar/personal-och-lonesystem/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:GivenName>Primula</md:GivenName>
     <md:SurName>Support</md:SurName>
     <md:EmailAddress>mailto:primulasupport@tietoevry.com</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:primulasupport@tietoevry.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:EmailAddress>mailto:primulasupport@tietoevry.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company>HKR</md:Company>
+    <md:GivenName>Servicedesk</md:GivenName>
+    <md:EmailAddress>mailto:3030@hkr.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 584bb844..915171fd 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -599,13 +599,13 @@
   <xi:include href="swamid-2.0/pilot.drive.sunet.se-apps-user_saml-saml-metadata.xml"/>
   <xi:include href="swamid-2.0/datalab.humlab.umu.se.xml"/>
   <xi:include href="swamid-2.0/hrm.flexhosting.se-hrm-.xml"/>
-  <xi:include href="swamid-2.0/rehab.uu.se-ticketserver-.xml"/>
+  <xi:include href="swamid-2.0/rehab.uu.se-TicketServer-.xml"/>
+  <xi:include href="swamid-2.0/rehab.test.uu.se-TicketServer-.xml"/>
   <xi:include href="swamid-2.0/visp.humlab.umu.se.xml"/>
   <xi:include href="swamid-2.0/stage.math.su.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/tse-uu.sitevision.se.xml"/>
   <xi:include href="swamid-2.0/www.ladoktest00.utv.ladok.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/student.ladoktest00.utv.ladok.se-student-sp.xml"/>
-  <xi:include href="swamid-2.0/rehab.test.uu.se-ticketserver-.xml"/>
   <xi:include href="swamid-2.0/laas.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/vgrgu.port.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/expert.demo.antagning.se-ecs-sp.xml"/>