1 files changed, 93 insertions, 24 deletions
diff --git a/swamid-2.0/www.alvin-portal.org-shibboleth.xml b/swamid-2.0/www.alvin-portal.org-shibboleth.xml
index ff80b973..9bb76b0c 100644
--- a/swamid-2.0/www.alvin-portal.org-shibboleth.xml
+++ b/swamid-2.0/www.alvin-portal.org-shibboleth.xml
@@ -7,8 +7,6 @@
     <mdattr:EntityAttributes>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -20,36 +18,81 @@
         <mdui:DisplayName xml:lang="en">Alvin</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Alvin är en plattform för digitalisering, beskrivning, lagring och tillgängliggörande av biblioteks/andra institutioners samlingar.</mdui:Description>
         <mdui:Description xml:lang="en">Alvin is a platform for digitizing, description, storage, and dissemination of collections in libraries and other culture heritage institutions.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://wiki.epc.ub.uu.se/display/alvininfo/Alvin+info</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://info.alvin-portal.org/?languageId=1</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://info.alvin-portal.org/?languageId=3</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.uu.se/en/about-uu/data-protection-policy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.uu.se/om-uu/dataskyddspolicy</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFNzCCAx+gAwIBAgIUNm+fX0vtnFs8+b249p3M4wC53dUwDQYJKoZIhvcNAQEL
+BQAwHzEdMBsGA1UEAxMUd3d3LmFsdmluLXBvcnRhbC5vcmcwHhcNMjIwOTE5MDgy
+MzIxWhcNMzIwOTE2MDgyMzIxWjAfMR0wGwYDVQQDExR3d3cuYWx2aW4tcG9ydGFs
+Lm9yZzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANmyNx6OoFzQMk27
+MNlGw+EaCABQ7Ww4j/+PWeDTIPczeigEND/3L5GXy4MRGPuuFoo9AhDWQ/s1Kngl
+7bqNrOb/1etXLc1nke/hFGGh4CFoHjWQc1TxwbAiQgruUKJpWaGGMTNyYPEk+fLf
+b1rcv5Hnm7+Krd2xvRJv/5w3YWIqx72M7cxP3LEKpG7zdCK4JrVMR0kf2OjcdyDN
+rkJyJBvbPKLuhx9+5Gp5ql0PJyS2c0zi8VEFLkdV3aO3Zwjitvn+QfHHnW+4ejHf
+P9d0JRBjOJ+KqBzjNgE7SjbG91fLvDzq71maWJ05cGBd1vYmgwnYDk5szIKMzlRm
+cxaDWHQLbK73QD6e5NpRE98I3JWRvPkfE4T5YtCXD2hdBnk9X9HUZkaxOz+DdMVR
+xsa5k4naoEEBMZl9BKnmNfu3Ea3J7JIZtzSBIOl5EJnOZOB+7yKMe7FnlsIvN88c
+NnFUIIdm+eQEnROLs1W9TRIzOzORK4YZ7YRm/LJZ4AMFMbVBlEZf1YZr3hkXvO2c
+p2yZZOVDE88LQXbjMhF6LqN8hOMxEgZW9HrHSvupuayzdgaCRZgMQbCwxdOneemr
+Oo8Hm6TH3ryGu5BfJJNbPIzMdaCxIT6hG29nAk1kfAIamlc9j9kY2r4NCPANglV1
+Z/8NouZw6AUdbcSEEmpKTQZ3r9MHAgMBAAGjazBpMEgGA1UdEQRBMD+CFHd3dy5h
+bHZpbi1wb3J0YWwub3JnhidodHRwczovL3d3dy5hbHZpbi1wb3J0YWwub3JnL3No
+aWJib2xldGgwHQYDVR0OBBYEFNfX4W1lLUZW8Tn4Iav/bPwHDgXDMA0GCSqGSIb3
+DQEBCwUAA4ICAQCjXuZG4fGvUlQE3EBZU8fhhv6ZkWwkOHQUYmz6LmTk7DNXmtPU
+udMweOzJ9CTgsYcqTN7Dyj09GF3FRO63eT2dg6ZKPmB6p8KfOx+/SyWNW63S4Haj
++4Vld9M6J7HjXadpsyfJtv3jrx9VQvaM9lCjAODEPBw+6CTXC0MtC6v67y8f3rsr
+vUa8ySWrSQvSjI2rEbjY4ZHmEyBmqDGG3JfQ/h7dx99hwv3VWpeUurD/SlkdXC5s
+vQGFkfKu6RJIHLZSV9Y/xoaktwqlUE+33H0jjYTtYwSgB4X7w4vm7C56nap8k8dR
+yICWhtVGe7rviNUHnTNAwhkJW92BKhsMspizXYkAiucu/CGEaG1g7Y9LShXqgeOe
+4kUyrKAbhLQGGrWt/FmRXzsVvjMPq9KLrsfNmyFGdhzQ8nmOj+PW9KoNriFAUKoY
+94g6xNGQ4dDHZS8cpP3sq5XvdjUziAeGRSf2SJHU1A/lAbcUm28+0ULrwVfeJciP
+3NoQ0LN2Ix08NeQC7rl6OqQguDag3NJGALehihWqR+Ihb9yjfGLuIiu8dG9wIuQY
+UPg7YAtGtiHh8/ua2qfcW0BOKJMkjL5anWiQuTpn6MtG7+1MtB2228g31MTpxX6h
+FJflNpCYcTMB8nyzpiFZTWICbKbQjynckh/y8GyNVHvmpYbq7n2nrtXWPw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
-        <ds:KeyName>www.alvin-portal.org</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=www.alvin-portal.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDAzCCAeugAwIBAgIJAMDMuQZ7AA/7MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-BAMTFHd3dy5hbHZpbi1wb3J0YWwub3JnMB4XDTE0MDQyMzExMjIxNloXDTI0MDQy
-MDExMjIxNlowHzEdMBsGA1UEAxMUd3d3LmFsdmluLXBvcnRhbC5vcmcwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDH4u8f1DVQPd+4GGO15zItmRoOzMUx
-P2CmfwY54kGqEbDuF5l7xlHd8nHoyc7xyq7+2iN3wqLYsc/bMRt/7nvaQgQ+9Abt
-n+UDSJP4Ja67tbTeASbzVQBLHZsbJpS5fSeu/U5pMs9ypzHLnkRRA8bH8H1k1Cbu
-ADcPjfs+ICzXSIEPMtdcPBitu1rVlomKHJGTc1dvroArHuKxKoF0o2B1v7wDq9nI
-b+WvUe7s2R4Ckm2Luu8vwHRNfIKQ2+JtAPuakWDDEYb6vkrt0DPMLrrqaoofGVZ+
-BWMnhQWLpQEcvBoOBVNQkHgFzGOzQiBatBqkTHwgHqYaRh66CUYn1D2vAgMBAAGj
-QjBAMB8GA1UdEQQYMBaCFHd3dy5hbHZpbi1wb3J0YWwub3JnMB0GA1UdDgQWBBRh
-8I/nWuX7DEoHKhQwzbJJ2OlZCjANBgkqhkiG9w0BAQUFAAOCAQEAuTHO3SFkz/Be
-2U13HyP7Dya3x/CDXInsUjI/5e4VfFYhaFvM7gKLI/2+/FKPhdH1gfZICl8NZoj6
-JABY7IdZ05XYjbuF1lP+BGOGma+b1ctaRJaL4tqEJS3T8SbvRbCudM78D2v+HTd2
-BGed+OkqQJDK+RtiD4YGJB0ivUWjKO9f6V7IAPn8kCAV6/wrxoVn9LV0VminU6pT
-cckp1mHdgJLan3LhOW6P/b3Rs0TXkRsBCCxizmbmO8oWbKPVjE8wbaPhl2dX3O9W
-bMNGcqL1wkQkAUiQjcma8zpBNxnQdb4xeEYAbJyDX+MulR8ZEbo67LCmPKtPQMfN
-nCC3ytLciA==
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIFNzCCAx+gAwIBAgIUcqdfPTIEWkFQb6pUImdquH6UdtAwDQYJKoZIhvcNAQEL
+BQAwHzEdMBsGA1UEAxMUd3d3LmFsdmluLXBvcnRhbC5vcmcwHhcNMjIwOTE5MDgy
+MzExWhcNMzIwOTE2MDgyMzExWjAfMR0wGwYDVQQDExR3d3cuYWx2aW4tcG9ydGFs
+Lm9yZzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALgdGPzsvuo+So2j
+rOVcElffy2iH7uoNFolbDr9sXGQDQ6ZdC3bG+2DFia38K6KLO7camInLPyQfQz6k
+iJ3eel8GSCfGEWBjzIGsAHDl99rkavjnGgYkwNMQtV90qj/BoyogMnnNYmUeErO8
+Bo9aFpf4QUVdbQO8zwG/Lu5+MxPbOtLJSSBtP2Uu/lateTRCFJ4zN+AZm8OZ1wTD
+P7QVy64brnKbHim3Gz/j2W5YNs20X2mtyrmVg/EKt9Kjz5e4Q0f/MIqzcT4Q5UHi
+iPfnpsRhVbnavI9DXsu9Z4ZUWsMci8cOenM70YRe0uY28ZgjxH8C44cIre5vj8qL
+JXijhbgQ0WJMxl/4D00hD7nEuRU4x7vslhET3hU3cRKU4vFQr8J0WUUP1pmPKKK/
+0NK5pijyw3L0ewP0HEUpF38509MitXoP7qljoHkkpJN2R82YbN+F/yEOTGu01ybf
+CcDrGvwREsy0Aq4bkeq14hFPq5HGun10i9CtCH8Uvhc5IDTTe+bkmIjzT5KjC3Nb
+W9Uj8LnAiqne4NRhmx8icwrbEDBAB0wVt06LmKdofSxqdqpm4FYeXBQQ1qraQh3Q
+u5WvD1gzlhJnj+y/49EP5Q21WZkpK0lU6C0MzV0QULN8Y2E/NXJ96+eLSdvTtiY4
+KWjzDsm/VBNldUsuEEMWP6e5mhlRAgMBAAGjazBpMEgGA1UdEQRBMD+CFHd3dy5h
+bHZpbi1wb3J0YWwub3JnhidodHRwczovL3d3dy5hbHZpbi1wb3J0YWwub3JnL3No
+aWJib2xldGgwHQYDVR0OBBYEFMyAUxQ6LLqknbPPHYzOnwpDRufeMA0GCSqGSIb3
+DQEBCwUAA4ICAQAyHv2SrMPUBXtAXGcqTyl1h47RBsH3Z046gs5A5HGKL6AqQA/O
+SB3kLUU74BKioWqUsg2Keg8YkBD7Lucpb9Jg29cSeKbXsS0KrgBMmBeqT1X5aD7A
+NCugtUteLcW5h06KUdt//a8WmE2qu/i6qBLmULG9J/eze9ISlgPquDVHSwN1XAUw
+g4hUGsfpVPU3A3HB7w9LP/I19Rajatpc+v2fNUg3jHChq++izL7ZNwJTPhUO6jPq
+1FT8e3z6wspljRCnsjAhGTUBC6j/oRXNhW4ktZCyJ1CwiMH2wORloZTtdm1kK8j/
+50tQlQ9gc3loNFGP1nYN1WKvHmIGXhacmKRHT5/rDac6az6cwtwq+E1jknGuqZMK
+l7MJvbp+RC52lK6koskE6n7nCOKIOXtnxWo7zv7WsGQFIWkfCWnYqUVBEyR7IAUT
+LYErja9aJIF0tNRKJD4oeoU5DpAlSDKrCedK5NQc0yvE0ztLlhO5EljyOhMoCM50
++tn8xtpfMgLLFcXpy9TSk2BwZOMErieyPH4BIzSRggAwJRy096U0JbSqJePdPcdg
+CT56KtW4kzWxcynb+LVBH6VZpBG1lbVcODA/RnAiGtxKNPnTMVRTd6IPV3r0EN4s
+WLv9BHJ8a6p0tbW0ga7EdUKfXTgT9P/CEY6YqjNkHhNYY5VsABX5FFqveA==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:KeyName>www.alvin-portal.org</ds:KeyName>
         <ds:X509Data>
@@ -90,4 +133,30 @@ nCC3ytLciA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.alvin-portal.org/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.alvin-portal.org/Shibboleth.sso/SAML/Artifact" index="6"/>
   </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">https://www.uu.se/en/?languageId=1</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.uu.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Palle</md:GivenName>
+    <md:SurName>Raabjerg</md:SurName>
+    <md:EmailAddress>mailto:palle.raabjerg@ub.uu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:EmailAddress>mailto:alvin-support@ub.uu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Stefan</md:GivenName>
+    <md:SurName>Andersson</md:SurName>
+    <md:EmailAddress>mailto:stefan.andersson@ub.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>Palle</md:GivenName>
+    <md:SurName>Raabjerg</md:SurName>
+    <md:EmailAddress>mailto:palle.raabjerg@ub.uu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>