From 2da13a222dee9dfe9f4ce843bc437b37e33b871f Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Tue, 20 Jan 2015 13:53:23 +0100
Subject: http://mds.edugain.org into swamid-interfederations-2.0

---
 .../wiki2.redclara.net-shibboleth.xml              | 165 ++++++++++-----------
 1 file changed, 80 insertions(+), 85 deletions(-)

(limited to 'swamid-interfederations-2.0/wiki2.redclara.net-shibboleth.xml')

diff --git a/swamid-interfederations-2.0/wiki2.redclara.net-shibboleth.xml b/swamid-interfederations-2.0/wiki2.redclara.net-shibboleth.xml
index be3ccc86..c5c3d7ef 100644
--- a/swamid-interfederations-2.0/wiki2.redclara.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/wiki2.redclara.net-shibboleth.xml
@@ -20,109 +20,104 @@
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>*.redclara.net</ds:KeyName>
         <ds:KeyName>redclara.net</ds:KeyName>
-        <ds:KeyName>wiki2.redclara.net</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=webmaster@redclara.net,CN=wiki2.redclara.net,C=CO,description=QfHSXQ3yP741Ruct</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGXTCCBUWgAwIBAgIDEP1PMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
-TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
-YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
-MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTQwNjEwMTI1ODM0
-WhcNMTUwNjExMDI1MjI0WjBsMRkwFwYDVQQNExBRZkhTWFEzeVA3NDFSdWN0MQsw
-CQYDVQQGEwJDTzEbMBkGA1UEAxMSd2lraTIucmVkY2xhcmEubmV0MSUwIwYJKoZI
-hvcNAQkBFhZ3ZWJtYXN0ZXJAcmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAvBhJOyV89jNU927Mxwn+DvisAsJZdwvYlV87LmOC970Y
-FACoyMNAW9HKUw14/eiGigtUSzIpc/sLqLWfdSOLvutMIS9l65iM5u6KVztBrqyA
-KHTQiYDgcSbBUe1oCvNfYfLVw0t14oIQwcw+JzjYK9QFsJ/v6ECvnUs0/IOXCfmD
-l4NHrNd3KJcvsHAkuRogEOXfAWSBc7xbT92ljjThTGrEwPJ8WJoXgRrEM5YUl1E4
-dEUgdoZ4ACKq8GxQR0et74+9ffamxRn+i5tIRcSeUJLo9DWCw14iTgnPpdJI6Tpb
-GcMmRh51rIodv1rmuRX/1UiJ+1+VmeJ0spWPma2lGwIDAQABo4IC5TCCAuEwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCA6gwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFKe6dZTQ54y1INi3qhIu62ZJdJ7DMB8GA1UdIwQYMBaAFOtCNNCYsKuf9Btr
-CPfMZC7vDixFMCsGA1UdEQQkMCKCEndpa2kyLnJlZGNsYXJhLm5ldIIMcmVkY2xh
-cmEubmV0MIIBVgYDVR0gBIIBTTCCAUkwCAYGZ4EMAQIBMIIBOwYLKwYBBAGBtTcB
-AgMwggEqMC4GCCsGAQUFBwIBFiJodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9wb2xp
-Y3kucGRmMIH3BggrBgEFBQcCAjCB6jAnFiBTdGFydENvbSBDZXJ0aWZpY2F0aW9u
-IEF1dGhvcml0eTADAgEBGoG+VGhpcyBjZXJ0aWZpY2F0ZSB3YXMgaXNzdWVkIGFj
-Y29yZGluZyB0byB0aGUgQ2xhc3MgMSBWYWxpZGF0aW9uIHJlcXVpcmVtZW50cyBv
-ZiB0aGUgU3RhcnRDb20gQ0EgcG9saWN5LCByZWxpYW5jZSBvbmx5IGZvciB0aGUg
-aW50ZW5kZWQgcHVycG9zZSBpbiBjb21wbGlhbmNlIG9mIHRoZSByZWx5aW5nIHBh
-cnR5IG9ibGlnYXRpb25zLjA1BgNVHR8ELjAsMCqgKKAmhiRodHRwOi8vY3JsLnN0
-YXJ0c3NsLmNvbS9jcnQxLWNybC5jcmwwgY4GCCsGAQUFBwEBBIGBMH8wOQYIKwYB
-BQUHMAGGLWh0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9zdWIvY2xhc3MxL3NlcnZl
-ci9jYTBCBggrBgEFBQcwAoY2aHR0cDovL2FpYS5zdGFydHNzbC5jb20vY2VydHMv
-c3ViLmNsYXNzMS5zZXJ2ZXIuY2EuY3J0MCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cu
-c3RhcnRzc2wuY29tLzANBgkqhkiG9w0BAQUFAAOCAQEAEXXajM3y024WuHBS9KX4
-D1mJgqJC3BN/0V6mCbrrtp7naDyg7mGdLEAkR403WwpR7cQlcopwCjzlVaaIM45d
-yiaMgJSxTcZHL5XD77nV7LjtgZDSDasmpIcvKezSwOqrdZgouukWUB4bcjpK8+JS
-vDhW4/nxjS85s0iQzM97y4AlunatpcVUkZmqOvpmoLtXofyRnP6fMXPkyGav1UUa
-rsIJlrC7xLyj8uLmF8SBQw5XqhJ3CieeYEWl9Oodqb9NPnW8+FJ/UPm2yjNbUo3q
-wnUR/FUAapCESXV1HZIoixTWrUlxCUVXJuMP58wjykYc/J6O5vV8I0HaAzQFG/lc
-2g==
+          <ds:X509SubjectName>CN=*.redclara.net,O=Cooperaci\C3\B3n Latinoamericana de Redes Avanzadas,L=Montevideo,C=UY</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFJzCCBA+gAwIBAgIQAycc1VlqLQ1YMhUWYD69ajANBgkqhkiG9w0BAQsFADBN
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E
+aWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQxMTI4MDAwMDAwWhcN
+MTcxMjA2MTIwMDAwWjB1MQswCQYDVQQGEwJVWTETMBEGA1UEBxMKTW9udGV2aWRl
+bzE4MDYGA1UECgwvQ29vcGVyYWNpw7NuIExhdGlub2FtZXJpY2FuYSBkZSBSZWRl
+cyBBdmFuemFkYXMxFzAVBgNVBAMMDioucmVkY2xhcmEubmV0MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4ciHwzKgzkUxp9PSRy9gV4WfIAmIjugbR8f9
+RJD9GwoMPTA173v4Rzjbnl8h/3e+iDfdzetHRM+gkOXwPCaGFpBQa2EPnxtFaaH6
+l8xtfHlsl8D2lqRkOE2OjvP8GzgpT3ikMBXoNr4TL7RQqzinwYCCJzLMSflwNbtk
+/a04k3l9FyxJ4mqEFP6aUsPJA0YRLVrYOIyppRzcHbRng/pNPE0R+JhNC3Kx2SbJ
+UvKtjQfvMJCn2T2dn5hg5mFnyMl78pgmRjppgxWEWkti+4eZoLg0OwVEFyGEgmEU
+amd6JmRZTDs04BtstymJNXdkTsCP7yk92lpAc9C3NZ3FvrR0eQIDAQABo4IB2TCC
+AdUwHwYDVR0jBBgwFoAUD4BhHIIxYdUvKOeNRji0LOHG2eIwHQYDVR0OBBYEFBFj
+G3+tyY7afXZLfXNuYoGnE0nEMCcGA1UdEQQgMB6CDioucmVkY2xhcmEubmV0ggxy
+ZWRjbGFyYS5uZXQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMB
+BggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2Vy
+dC5jb20vc3NjYS1zaGEyLWczLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNl
+cnQuY29tL3NzY2Etc2hhMi1nMy5jcmwwQgYDVR0gBDswOTA3BglghkgBhv1sAQEw
+KjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzB8Bggr
+BgEFBQcBAQRwMG4wJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNv
+bTBGBggrBgEFBQcwAoY6aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lD
+ZXJ0U0hBMlNlY3VyZVNlcnZlckNBLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3
+DQEBCwUAA4IBAQB3WePP9QxLi7OdtCbfR6kqIPDvfVX3aMvJ3/LQW9GhugwkV+ay
+8GyG17Dbm6Y2YSn1vl36lf/Nas4Lxf5jaVKXXoPUfANaDlJkK3E+cMsh1xrs8Uef
+MgiRll8Q28jA1RH+vmA+hzHOhuNqM8xHl2c/9Eq7FmFYoP4A1Lo/N9dEHHlHhSkG
+I6kBgBW/MAPvSLLPWr4v0u+/ynH9v+PEo60skvnrQPH0wFPoyJd/zxOMaomleJEv
+yL8CtS8Jo8/gqJ76zITM2JD1Cd+NBrPLk41I/hcfQ7Eewb/lkKe8/tpNm3e3bXJG
+s5W/0Lq2GRjQh9nrDfVs2IuE1c5zeqToyp98
 </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>*.redclara.net</ds:KeyName>
         <ds:KeyName>redclara.net</ds:KeyName>
-        <ds:KeyName>wiki2.redclara.net</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=webmaster@redclara.net,CN=wiki2.redclara.net,C=CO,description=QfHSXQ3yP741Ruct</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGXTCCBUWgAwIBAgIDEP1PMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
-TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
-YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
-MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTQwNjEwMTI1ODM0
-WhcNMTUwNjExMDI1MjI0WjBsMRkwFwYDVQQNExBRZkhTWFEzeVA3NDFSdWN0MQsw
-CQYDVQQGEwJDTzEbMBkGA1UEAxMSd2lraTIucmVkY2xhcmEubmV0MSUwIwYJKoZI
-hvcNAQkBFhZ3ZWJtYXN0ZXJAcmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAvBhJOyV89jNU927Mxwn+DvisAsJZdwvYlV87LmOC970Y
-FACoyMNAW9HKUw14/eiGigtUSzIpc/sLqLWfdSOLvutMIS9l65iM5u6KVztBrqyA
-KHTQiYDgcSbBUe1oCvNfYfLVw0t14oIQwcw+JzjYK9QFsJ/v6ECvnUs0/IOXCfmD
-l4NHrNd3KJcvsHAkuRogEOXfAWSBc7xbT92ljjThTGrEwPJ8WJoXgRrEM5YUl1E4
-dEUgdoZ4ACKq8GxQR0et74+9ffamxRn+i5tIRcSeUJLo9DWCw14iTgnPpdJI6Tpb
-GcMmRh51rIodv1rmuRX/1UiJ+1+VmeJ0spWPma2lGwIDAQABo4IC5TCCAuEwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCA6gwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFKe6dZTQ54y1INi3qhIu62ZJdJ7DMB8GA1UdIwQYMBaAFOtCNNCYsKuf9Btr
-CPfMZC7vDixFMCsGA1UdEQQkMCKCEndpa2kyLnJlZGNsYXJhLm5ldIIMcmVkY2xh
-cmEubmV0MIIBVgYDVR0gBIIBTTCCAUkwCAYGZ4EMAQIBMIIBOwYLKwYBBAGBtTcB
-AgMwggEqMC4GCCsGAQUFBwIBFiJodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9wb2xp
-Y3kucGRmMIH3BggrBgEFBQcCAjCB6jAnFiBTdGFydENvbSBDZXJ0aWZpY2F0aW9u
-IEF1dGhvcml0eTADAgEBGoG+VGhpcyBjZXJ0aWZpY2F0ZSB3YXMgaXNzdWVkIGFj
-Y29yZGluZyB0byB0aGUgQ2xhc3MgMSBWYWxpZGF0aW9uIHJlcXVpcmVtZW50cyBv
-ZiB0aGUgU3RhcnRDb20gQ0EgcG9saWN5LCByZWxpYW5jZSBvbmx5IGZvciB0aGUg
-aW50ZW5kZWQgcHVycG9zZSBpbiBjb21wbGlhbmNlIG9mIHRoZSByZWx5aW5nIHBh
-cnR5IG9ibGlnYXRpb25zLjA1BgNVHR8ELjAsMCqgKKAmhiRodHRwOi8vY3JsLnN0
-YXJ0c3NsLmNvbS9jcnQxLWNybC5jcmwwgY4GCCsGAQUFBwEBBIGBMH8wOQYIKwYB
-BQUHMAGGLWh0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9zdWIvY2xhc3MxL3NlcnZl
-ci9jYTBCBggrBgEFBQcwAoY2aHR0cDovL2FpYS5zdGFydHNzbC5jb20vY2VydHMv
-c3ViLmNsYXNzMS5zZXJ2ZXIuY2EuY3J0MCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cu
-c3RhcnRzc2wuY29tLzANBgkqhkiG9w0BAQUFAAOCAQEAEXXajM3y024WuHBS9KX4
-D1mJgqJC3BN/0V6mCbrrtp7naDyg7mGdLEAkR403WwpR7cQlcopwCjzlVaaIM45d
-yiaMgJSxTcZHL5XD77nV7LjtgZDSDasmpIcvKezSwOqrdZgouukWUB4bcjpK8+JS
-vDhW4/nxjS85s0iQzM97y4AlunatpcVUkZmqOvpmoLtXofyRnP6fMXPkyGav1UUa
-rsIJlrC7xLyj8uLmF8SBQw5XqhJ3CieeYEWl9Oodqb9NPnW8+FJ/UPm2yjNbUo3q
-wnUR/FUAapCESXV1HZIoixTWrUlxCUVXJuMP58wjykYc/J6O5vV8I0HaAzQFG/lc
-2g==
+          <ds:X509SubjectName>CN=*.redclara.net,O=Cooperaci\C3\B3n Latinoamericana de Redes Avanzadas,L=Montevideo,C=UY</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFJzCCBA+gAwIBAgIQAycc1VlqLQ1YMhUWYD69ajANBgkqhkiG9w0BAQsFADBN
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E
+aWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQxMTI4MDAwMDAwWhcN
+MTcxMjA2MTIwMDAwWjB1MQswCQYDVQQGEwJVWTETMBEGA1UEBxMKTW9udGV2aWRl
+bzE4MDYGA1UECgwvQ29vcGVyYWNpw7NuIExhdGlub2FtZXJpY2FuYSBkZSBSZWRl
+cyBBdmFuemFkYXMxFzAVBgNVBAMMDioucmVkY2xhcmEubmV0MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4ciHwzKgzkUxp9PSRy9gV4WfIAmIjugbR8f9
+RJD9GwoMPTA173v4Rzjbnl8h/3e+iDfdzetHRM+gkOXwPCaGFpBQa2EPnxtFaaH6
+l8xtfHlsl8D2lqRkOE2OjvP8GzgpT3ikMBXoNr4TL7RQqzinwYCCJzLMSflwNbtk
+/a04k3l9FyxJ4mqEFP6aUsPJA0YRLVrYOIyppRzcHbRng/pNPE0R+JhNC3Kx2SbJ
+UvKtjQfvMJCn2T2dn5hg5mFnyMl78pgmRjppgxWEWkti+4eZoLg0OwVEFyGEgmEU
+amd6JmRZTDs04BtstymJNXdkTsCP7yk92lpAc9C3NZ3FvrR0eQIDAQABo4IB2TCC
+AdUwHwYDVR0jBBgwFoAUD4BhHIIxYdUvKOeNRji0LOHG2eIwHQYDVR0OBBYEFBFj
+G3+tyY7afXZLfXNuYoGnE0nEMCcGA1UdEQQgMB6CDioucmVkY2xhcmEubmV0ggxy
+ZWRjbGFyYS5uZXQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMB
+BggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2Vy
+dC5jb20vc3NjYS1zaGEyLWczLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNl
+cnQuY29tL3NzY2Etc2hhMi1nMy5jcmwwQgYDVR0gBDswOTA3BglghkgBhv1sAQEw
+KjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzB8Bggr
+BgEFBQcBAQRwMG4wJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNv
+bTBGBggrBgEFBQcwAoY6aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lD
+ZXJ0U0hBMlNlY3VyZVNlcnZlckNBLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3
+DQEBCwUAA4IBAQB3WePP9QxLi7OdtCbfR6kqIPDvfVX3aMvJ3/LQW9GhugwkV+ay
+8GyG17Dbm6Y2YSn1vl36lf/Nas4Lxf5jaVKXXoPUfANaDlJkK3E+cMsh1xrs8Uef
+MgiRll8Q28jA1RH+vmA+hzHOhuNqM8xHl2c/9Eq7FmFYoP4A1Lo/N9dEHHlHhSkG
+I6kBgBW/MAPvSLLPWr4v0u+/ynH9v+PEo60skvnrQPH0wFPoyJd/zxOMaomleJEv
+yL8CtS8Jo8/gqJ76zITM2JD1Cd+NBrPLk41I/hcfQ7Eewb/lkKe8/tpNm3e3bXJG
+s5W/0Lq2GRjQh9nrDfVs2IuE1c5zeqToyp98
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki2.redclara.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki2.redclara.net/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki2.redclara.net/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki2.redclara.net/Shibboleth.sso/SLO/POST"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki2.redclara.net/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki2.redclara.net/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki2.redclara.net/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki2.redclara.net/Shibboleth.sso/NIM/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki2.redclara.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki2.redclara.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki2.redclara.net/Shibboleth.sso/SLO/SOAP"/>
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki2.redclara.net/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki2.redclara.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki2.redclara.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki2.redclara.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki2.redclara.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki2.redclara.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki2.redclara.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki2.redclara.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki2.redclara.net/Shibboleth.sso/NIM/SOAP"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki2.redclara.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki2.redclara.net/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki2.redclara.net/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki2.redclara.net/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki2.redclara.net/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki2.redclara.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Wiki - RedCLARA</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">
+Wiki - RedCLARA
+</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">RedCLARA</md:OrganizationName>
-- 
cgit v1.2.3