1 files changed, 30 insertions, 76 deletions
diff --git a/swamid-interfederations-2.0/easydb.geschkult.fu-berlin.de-shibboleth.xml b/swamid-interfederations-2.0/easydb.geschkult.fu-berlin.de-shibboleth.xml
index 6056616c..4fedbd37 100644
--- a/swamid-interfederations-2.0/easydb.geschkult.fu-berlin.de-shibboleth.xml
+++ b/swamid-interfederations-2.0/easydb.geschkult.fu-berlin.de-shibboleth.xml
@@ -17,80 +17,44 @@
         <mdui:InformationURL xml:lang="en">http://www.geschkult.fu-berlin.de/e/khi/diathek/digitale_diathek/index.html</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:KeyName>easydb.geschkult.fu-berlin.de</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=easydb.geschkult.fu-berlin.de,OU=Fachbereich Geschichts- und Kulturwissenschaften,O=Freie Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFkzCCBHugAwIBAgIHE7TczjDCKjANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UE
+          <ds:X509Certificate>MIIGJTCCBQ2gAwIBAgIHGPlbfiq0XjANBgkqhkiG9w0BAQsFADCBtTELMAkGA1UE
 BhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSIwIAYDVQQK
 ExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVybGluMQ4wDAYDVQQLEwVaRURBVDEwMC4G
 A1UEAxMnRnJlaWUgVW5pdmVyc2l0YWV0IEJlcmxpbiAtIEZVLUNBIC0gRzAxMR4w
-HAYJKoZIhvcNAQkBFg9jYUBGVS1CZXJsaW4uREUwHhcNMTIwNDIzMTM1NTEwWhcN
-MTcwNDIyMTM1NTEwWjCBtjELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEP
-MA0GA1UEBxMGQmVybGluMSIwIAYDVQQKExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVy
-bGluMTkwNwYDVQQLEzBGYWNoYmVyZWljaCBHZXNjaGljaHRzLSB1bmQgS3VsdHVy
-d2lzc2Vuc2NoYWZ0ZW4xJjAkBgNVBAMTHWVhc3lkYi5nZXNjaGt1bHQuZnUtYmVy
+HAYJKoZIhvcNAQkBFg9jYUBGVS1CZXJsaW4uREUwHhcNMTUwMjEwMTAzMTEwWhcN
+MTkwNzA5MjM1OTAwWjCBtjELMAkGA1UEBhMCREUxDzANBgNVBAgMBkJlcmxpbjEP
+MA0GA1UEBwwGQmVybGluMSIwIAYDVQQKDBlGcmVpZSBVbml2ZXJzaXRhZXQgQmVy
+bGluMTkwNwYDVQQLDDBGYWNoYmVyZWljaCBHZXNjaGljaHRzLSB1bmQgS3VsdHVy
+d2lzc2Vuc2NoYWZ0ZW4xJjAkBgNVBAMMHWVhc3lkYi5nZXNjaGt1bHQuZnUtYmVy
 bGluLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApP7F9ySZ1qMs
 Pm1YPt3amWqd9NpjBxQdGSvWW8s5YO5yc/zM7K6s6jp71J9BEq6gQbCOb1J1Rkwu
 ANyZIbKF9YPzKixntzebSUt228zxCZmBL2zSvIVBOKxX0SXoRc3te93w4yhd1wK0
 zIkN/r4r7sCEbM7GUScLVnwn6vgVT0amPJ973sd1NEpkFiDqgvnOp9MbVRmejlVy
 OIcgeWBO7k+kR6wk8pZKhHv1EeUSI0MdN5NcuhcHLJqlTCS9mtao5wjHbKqOrsZq
 3+2BhAK+YsmU8kBAEWTJuGL295e0JUHg+n13/9TApNFckOgezXF3LTrQuht0aV8c
-AqYhXz7W6wIDAQABo4IBozCCAZ8wHAYDVR0gBBUwEzARBg8rBgEEAYGtIYIsAQEE
-AgIwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIG
-CCsGAQUFBwMBMB0GA1UdDgQWBBTDwIXCByjCQwen9jTvzxD9U2HzlTAfBgNVHSME
-GDAWgBQG4T30b/Qwt3o7V7AxBYl7DVhabDB1BgNVHR8EbjBsMDSgMqAwhi5odHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDSgMqAw
-hi5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3Js
-MIGQBggrBgEFBQcBAQSBgzCBgDA+BggrBgEFBQcwAoYyaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9mdS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwPgYIKwYBBQUHMAKG
-Mmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZnUtY2EvcHViL2NhY2VydC9jYWNlcnQu
-Y3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBpQGFGtc2dC1+eoRR9ULUohMVt4uQLucbz
-qKueAVHWDlHOb1GwehouIMAjmff5thm2O3DtpF2XzhMgVfsWArozAzpNBOBuvn25
-gyUQvDcwNzd4p07EacdtCO4L3DWKbbaSCRiYETC+Z5JZRVHlGKfJezIT0165eyOD
-7Avdrp64lqZHvJgdunrn3dHHjhG9W33hWkUo1b3yVWnxy3gwK0LcVPGIRc43Jtx2
-Qin/U8AZ72GKn3mx2zhB4rPMC2hlSVd+uRl/tYJ+XCxQBlTr20lFE+YugukP64HY
-DrH/2UPUl2lUMBXA64UsRXgFovJd0H/EXzNJhEdFsrRUOQLx+GzD
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>easydb.geschkult.fu-berlin.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=easydb.geschkult.fu-berlin.de,OU=Fachbereich Geschichts- und Kulturwissenschaften,O=Freie Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFkzCCBHugAwIBAgIHE7TczjDCKjANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSIwIAYDVQQK
-ExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVybGluMQ4wDAYDVQQLEwVaRURBVDEwMC4G
-A1UEAxMnRnJlaWUgVW5pdmVyc2l0YWV0IEJlcmxpbiAtIEZVLUNBIC0gRzAxMR4w
-HAYJKoZIhvcNAQkBFg9jYUBGVS1CZXJsaW4uREUwHhcNMTIwNDIzMTM1NTEwWhcN
-MTcwNDIyMTM1NTEwWjCBtjELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEP
-MA0GA1UEBxMGQmVybGluMSIwIAYDVQQKExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVy
-bGluMTkwNwYDVQQLEzBGYWNoYmVyZWljaCBHZXNjaGljaHRzLSB1bmQgS3VsdHVy
-d2lzc2Vuc2NoYWZ0ZW4xJjAkBgNVBAMTHWVhc3lkYi5nZXNjaGt1bHQuZnUtYmVy
-bGluLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApP7F9ySZ1qMs
-Pm1YPt3amWqd9NpjBxQdGSvWW8s5YO5yc/zM7K6s6jp71J9BEq6gQbCOb1J1Rkwu
-ANyZIbKF9YPzKixntzebSUt228zxCZmBL2zSvIVBOKxX0SXoRc3te93w4yhd1wK0
-zIkN/r4r7sCEbM7GUScLVnwn6vgVT0amPJ973sd1NEpkFiDqgvnOp9MbVRmejlVy
-OIcgeWBO7k+kR6wk8pZKhHv1EeUSI0MdN5NcuhcHLJqlTCS9mtao5wjHbKqOrsZq
-3+2BhAK+YsmU8kBAEWTJuGL295e0JUHg+n13/9TApNFckOgezXF3LTrQuht0aV8c
-AqYhXz7W6wIDAQABo4IBozCCAZ8wHAYDVR0gBBUwEzARBg8rBgEEAYGtIYIsAQEE
-AgIwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIG
-CCsGAQUFBwMBMB0GA1UdDgQWBBTDwIXCByjCQwen9jTvzxD9U2HzlTAfBgNVHSME
-GDAWgBQG4T30b/Qwt3o7V7AxBYl7DVhabDB1BgNVHR8EbjBsMDSgMqAwhi5odHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDSgMqAw
-hi5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3Js
-MIGQBggrBgEFBQcBAQSBgzCBgDA+BggrBgEFBQcwAoYyaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9mdS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwPgYIKwYBBQUHMAKG
-Mmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZnUtY2EvcHViL2NhY2VydC9jYWNlcnQu
-Y3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBpQGFGtc2dC1+eoRR9ULUohMVt4uQLucbz
-qKueAVHWDlHOb1GwehouIMAjmff5thm2O3DtpF2XzhMgVfsWArozAzpNBOBuvn25
-gyUQvDcwNzd4p07EacdtCO4L3DWKbbaSCRiYETC+Z5JZRVHlGKfJezIT0165eyOD
-7Avdrp64lqZHvJgdunrn3dHHjhG9W33hWkUo1b3yVWnxy3gwK0LcVPGIRc43Jtx2
-Qin/U8AZ72GKn3mx2zhB4rPMC2hlSVd+uRl/tYJ+XCxQBlTr20lFE+YugukP64HY
-DrH/2UPUl2lUMBXA64UsRXgFovJd0H/EXzNJhEdFsrRUOQLx+GzD
+AqYhXz7W6wIDAQABo4ICNTCCAjEwTwYDVR0gBEgwRjARBg8rBgEEAYGtIYIsAQEE
+AwMwEQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGB
+rSGCLB4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUH
+AwIGCCsGAQUFBwMBMB0GA1UdDgQWBBTDwIXCByjCQwen9jTvzxD9U2HzlTAfBgNV
+HSMEGDAWgBQG4T30b/Qwt3o7V7AxBYl7DVhabDAoBgNVHREEITAfgh1lYXN5ZGIu
+Z2VzY2hrdWx0LmZ1LWJlcmxpbi5kZTB1BgNVHR8EbjBsMDSgMqAwhi5odHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDSgMqAwhi5o
+dHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIHF
+BggrBgEFBQcBAQSBuDCBtTAzBggrBgEFBQcwAYYnaHR0cDovL29jc3AucGNhLmRm
+bi5kZS9PQ1NQLVNlcnZlci9PQ1NQMD4GCCsGAQUFBzAChjJodHRwOi8vY2RwMS5w
+Y2EuZGZuLmRlL2Z1LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA+BggrBgEFBQcw
+AoYyaHR0cDovL2NkcDIucGNhLmRmbi5kZS9mdS1jYS9wdWIvY2FjZXJ0L2NhY2Vy
+dC5jcnQwDQYJKoZIhvcNAQELBQADggEBADkcodl3suRysfy0lAGAsrejt9OLVH6A
+NRVH8n4eYS4q9TfhvkV1OCsaFMnsoBZzWwZK+kJ35IkNnBPhXGmsrm4CWaqZmEXe
+xPYcmvHkqSm+NHd45AFbGvVSXTCHJyMJwfcP9Y++0fiMZTFMS94Zm5Tnuopzul1d
+VL+IhzvGNQ+/UP7+b1LermUxrpj06jsbOdEK6invAoAnqMqXkXDmG1owA1cRPCY9
+tOE4g/hlvLMgOQ3413fJ/GR/R7RwYKuP/EFayaeZrt0cGZuRfCp7SJVLmMb48GBP
+VlBXGupf8n951icED+IDh47RglDOnvS8DpOvHDtysd/ctiSwZ8vJCOQ=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -129,23 +93,13 @@ DrH/2UPUl2lUMBXA64UsRXgFovJd0H/EXzNJhEdFsrRUOQLx+GzD
     <md:OrganizationURL xml:lang="en">https://identity.fu-berlin.de/idp-fub/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>Johannes</md:GivenName>
-    <md:SurName>Posel</md:SurName>
-    <md:EmailAddress>mailto:support@geschkult.fu-berlin.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Steffen</md:GivenName>
-    <md:SurName>Hofmann</md:SurName>
-    <md:EmailAddress>mailto:fudis@zedat.fu-berlin.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Johannes</md:GivenName>
-    <md:SurName>Posel</md:SurName>
-    <md:EmailAddress>mailto:support@geschkult.fu-berlin.de</md:EmailAddress>
+    <md:GivenName>Funktionsadresse</md:GivenName>
+    <md:SurName>IT des Fachbereichs Geschichts- und Kulturwissenschaften</md:SurName>
+    <md:EmailAddress>mailto:servermaster@geschkult.fu-berlin.de</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
-    <md:GivenName>Johannes</md:GivenName>
-    <md:SurName>Posel</md:SurName>
+    <md:GivenName>Funktionsadresse</md:GivenName>
+    <md:SurName>IT-Support des Fachbereichs Geschichts- und Kulturwissenschaften</md:SurName>
     <md:EmailAddress>mailto:support@geschkult.fu-berlin.de</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>