git-svn-id: svn+ssh://svn.it.su.se/svn/swamid-metadata/trunk@134 0878fbc5-a6f2-46f6-b174-cb7b08c221d1

1 files changed, 19 insertions, 56 deletions

diff --git a/nya-workshop/130.229.16.238.xml b/nya-workshop/130.229.16.238.xml
index 3af9ab98..5c8012a1 100644
--- a/nya-workshop/130.229.16.238.xml
+++ b/nya-workshop/130.229.16.238.xml
@@ -1,34 +1,15 @@
-
+<?xml version="1.0"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://130-229-16-238-dhcp.ap-wlan.ki.se/shibboleth">
-
   <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>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://localhost.localdomain/Shibboleth.sso/DS" index="1"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://130-229-16-238-dhcp.ap-wlan.ki.se/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:KeyName>130-229-16-238-dhcp.ap-wlan.ki.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=130-229-16-238-dhcp.ap-wlan.ki.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDTTCCAjWgAwIBAgIJAOzurRJx5hUvMA0GCSqGSIb3DQEBBQUAMCwxKjAoBgNV
-BAMTITEzMC0yMjktMTYtMjM4LWRoY3AuYXAtd2xhbi5raS5zZTAeFw0wOTA0MjEx
-NDIwNDlaFw0xOTA0MTkxNDIwNDlaMCwxKjAoBgNVBAMTITEzMC0yMjktMTYtMjM4
-LWRoY3AuYXAtd2xhbi5raS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAN0hol5vp2lftRb3EP2UovcrWU4eo6fSnxjsAOQuJXGFEPvl+BoyYo/LsypH
-MI6510X2zVrm2q9UZUHLlf5cAjNzpmehbiErGF2eYzb9LFJbUzYdQnTwqLI9Xs+f
-XyBWG7Nfm65V2ymagkyQCltl8JnV+j0IsWkPipM+LEKJo7KBadnSkIDg7nr6LM4j
-GCyTuCUijmJ8pZqFlrHkcmLLzmuK6W/1xjHAR0bHfOqVeSZN2kEGz11EhqY2/qcB
-vFpxYgkwhPbwNVOGnaCNrYFfoKtBG7/GC63wNdBpauOilvPn+m63bguS6lnkRl2j
-Tg4X1AoOt8YyinE/a1DWrc7aGisCAwEAAaNyMHAwTwYDVR0RBEgwRoIhMTMwLTIy
-OS0xNi0yMzgtZGhjcC5hcC13bGFuLmtpLnNlhiExMzAtMjI5LTE2LTIzOC1kaGNw
-LmFwLXdsYW4ua2kuc2UwHQYDVR0OBBYEFGIIBuGXADoGUr1hvFvNv3y547rhMA0G
-CSqGSIb3DQEBBQUAA4IBAQAqU6P4wIFqYBzmQQdI3ABSx44sLD/deWX9ukD+uWiB
-nQ77eY41C0G2KIXfaSojcec+D7sJEDZsbjY1+R8YR1K4UhNcKHOgI/vPXrKkKeyL
-ac1/G4V9w9S8MSK7o4+Y06yWLqAV/2dIXMo4kKa43IlpYz7ygRAwtAUFWueZEExO
-ThP81BKNMguv4KxoPsSLdYtsZkYnfVTiK6jNitxci3t0RPF/YwGOqw38KkVW/NTW
-gPuua9/Jj6c5WWML8uzKc39Jzh7X0C1iwDPKdhcVOAPKSLGNBs2p0OAeguRrX9ON
-7YRs5nK4eVIcRjFIKS67ShaSi6/zuQq20zr9huoKFcqt
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIDTTCCAjWgAwIBAgIJAOzurRJx5hUvMA0GCSqGSIb3DQEBBQUAMCwxKjAoBgNVBAMTITEzMC0yMjktMTYtMjM4LWRoY3AuYXAtd2xhbi5raS5zZTAeFw0wOTA0MjExNDIwNDlaFw0xOTA0MTkxNDIwNDlaMCwxKjAoBgNVBAMTITEzMC0yMjktMTYtMjM4LWRoY3AuYXAtd2xhbi5raS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN0hol5vp2lftRb3EP2UovcrWU4eo6fSnxjsAOQuJXGFEPvl+BoyYo/LsypHMI6510X2zVrm2q9UZUHLlf5cAjNzpmehbiErGF2eYzb9LFJbUzYdQnTwqLI9Xs+fXyBWG7Nfm65V2ymagkyQCltl8JnV+j0IsWkPipM+LEKJo7KBadnSkIDg7nr6LM4jGCyTuCUijmJ8pZqFlrHkcmLLzmuK6W/1xjHAR0bHfOqVeSZN2kEGz11EhqY2/qcBvFpxYgkwhPbwNVOGnaCNrYFfoKtBG7/GC63wNdBpauOilvPn+m63bguS6lnkRl2jTg4X1AoOt8YyinE/a1DWrc7aGisCAwEAAaNyMHAwTwYDVR0RBEgwRoIhMTMwLTIyOS0xNi0yMzgtZGhjcC5hcC13bGFuLmtpLnNlhiExMzAtMjI5LTE2LTIzOC1kaGNwLmFwLXdsYW4ua2kuc2UwHQYDVR0OBBYEFGIIBuGXADoGUr1hvFvNv3y547rhMA0GCSqGSIb3DQEBBQUAA4IBAQAqU6P4wIFqYBzmQQdI3ABSx44sLD/deWX9ukD+uWiBnQ77eY41C0G2KIXfaSojcec+D7sJEDZsbjY1+R8YR1K4UhNcKHOgI/vPXrKkKeyLac1/G4V9w9S8MSK7o4+Y06yWLqAV/2dIXMo4kKa43IlpYz7ygRAwtAUFWueZEExOThP81BKNMguv4KxoPsSLdYtsZkYnfVTiK6jNitxci3t0RPF/YwGOqw38KkVW/NTWgPuua9/Jj6c5WWML8uzKc39Jzh7X0C1iwDPKdhcVOAPKSLGNBs2p0OAeguRrX9ON7YRs5nK4eVIcRjFIKS67ShaSi6/zuQq20zr9huoKFcqt</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
@@ -37,42 +18,24 @@ gPuua9/Jj6c5WWML8uzKc39Jzh7X0C1iwDPKdhcVOAPKSLGNBs2p0OAeguRrX9ON
         <ds:KeyName>130-229-16-238-dhcp.ap-wlan.ki.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=130-229-16-238-dhcp.ap-wlan.ki.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDTTCCAjWgAwIBAgIJAOzurRJx5hUvMA0GCSqGSIb3DQEBBQUAMCwxKjAoBgNV
-BAMTITEzMC0yMjktMTYtMjM4LWRoY3AuYXAtd2xhbi5raS5zZTAeFw0wOTA0MjEx
-NDIwNDlaFw0xOTA0MTkxNDIwNDlaMCwxKjAoBgNVBAMTITEzMC0yMjktMTYtMjM4
-LWRoY3AuYXAtd2xhbi5raS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAN0hol5vp2lftRb3EP2UovcrWU4eo6fSnxjsAOQuJXGFEPvl+BoyYo/LsypH
-MI6510X2zVrm2q9UZUHLlf5cAjNzpmehbiErGF2eYzb9LFJbUzYdQnTwqLI9Xs+f
-XyBWG7Nfm65V2ymagkyQCltl8JnV+j0IsWkPipM+LEKJo7KBadnSkIDg7nr6LM4j
-GCyTuCUijmJ8pZqFlrHkcmLLzmuK6W/1xjHAR0bHfOqVeSZN2kEGz11EhqY2/qcB
-vFpxYgkwhPbwNVOGnaCNrYFfoKtBG7/GC63wNdBpauOilvPn+m63bguS6lnkRl2j
-Tg4X1AoOt8YyinE/a1DWrc7aGisCAwEAAaNyMHAwTwYDVR0RBEgwRoIhMTMwLTIy
-OS0xNi0yMzgtZGhjcC5hcC13bGFuLmtpLnNlhiExMzAtMjI5LTE2LTIzOC1kaGNw
-LmFwLXdsYW4ua2kuc2UwHQYDVR0OBBYEFGIIBuGXADoGUr1hvFvNv3y547rhMA0G
-CSqGSIb3DQEBBQUAA4IBAQAqU6P4wIFqYBzmQQdI3ABSx44sLD/deWX9ukD+uWiB
-nQ77eY41C0G2KIXfaSojcec+D7sJEDZsbjY1+R8YR1K4UhNcKHOgI/vPXrKkKeyL
-ac1/G4V9w9S8MSK7o4+Y06yWLqAV/2dIXMo4kKa43IlpYz7ygRAwtAUFWueZEExO
-ThP81BKNMguv4KxoPsSLdYtsZkYnfVTiK6jNitxci3t0RPF/YwGOqw38KkVW/NTW
-gPuua9/Jj6c5WWML8uzKc39Jzh7X0C1iwDPKdhcVOAPKSLGNBs2p0OAeguRrX9ON
-7YRs5nK4eVIcRjFIKS67ShaSi6/zuQq20zr9huoKFcqt
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIDTTCCAjWgAwIBAgIJAOzurRJx5hUvMA0GCSqGSIb3DQEBBQUAMCwxKjAoBgNVBAMTITEzMC0yMjktMTYtMjM4LWRoY3AuYXAtd2xhbi5raS5zZTAeFw0wOTA0MjExNDIwNDlaFw0xOTA0MTkxNDIwNDlaMCwxKjAoBgNVBAMTITEzMC0yMjktMTYtMjM4LWRoY3AuYXAtd2xhbi5raS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN0hol5vp2lftRb3EP2UovcrWU4eo6fSnxjsAOQuJXGFEPvl+BoyYo/LsypHMI6510X2zVrm2q9UZUHLlf5cAjNzpmehbiErGF2eYzb9LFJbUzYdQnTwqLI9Xs+fXyBWG7Nfm65V2ymagkyQCltl8JnV+j0IsWkPipM+LEKJo7KBadnSkIDg7nr6LM4jGCyTuCUijmJ8pZqFlrHkcmLLzmuK6W/1xjHAR0bHfOqVeSZN2kEGz11EhqY2/qcBvFpxYgkwhPbwNVOGnaCNrYFfoKtBG7/GC63wNdBpauOilvPn+m63bguS6lnkRl2jTg4X1AoOt8YyinE/a1DWrc7aGisCAwEAAaNyMHAwTwYDVR0RBEgwRoIhMTMwLTIyOS0xNi0yMzgtZGhjcC5hcC13bGFuLmtpLnNlhiExMzAtMjI5LTE2LTIzOC1kaGNwLmFwLXdsYW4ua2kuc2UwHQYDVR0OBBYEFGIIBuGXADoGUr1hvFvNv3y547rhMA0GCSqGSIb3DQEBBQUAA4IBAQAqU6P4wIFqYBzmQQdI3ABSx44sLD/deWX9ukD+uWiBnQ77eY41C0G2KIXfaSojcec+D7sJEDZsbjY1+R8YR1K4UhNcKHOgI/vPXrKkKeyLac1/G4V9w9S8MSK7o4+Y06yWLqAV/2dIXMo4kKa43IlpYz7ygRAwtAUFWueZEExOThP81BKNMguv4KxoPsSLdYtsZkYnfVTiK6jNitxci3t0RPF/YwGOqw38KkVW/NTWgPuua9/Jj6c5WWML8uzKc39Jzh7X0C1iwDPKdhcVOAPKSLGNBs2p0OAeguRrX9ON7YRs5nK4eVIcRjFIKS67ShaSi6/zuQq20zr9huoKFcqt</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://localhost.localdomain/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://localhost.localdomain/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://localhost.localdomain/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://localhost.localdomain/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://localhost.localdomain/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://localhost.localdomain/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://localhost.localdomain/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://localhost.localdomain/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://localhost.localdomain/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://localhost.localdomain/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://localhost.localdomain/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://localhost.localdomain/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://localhost.localdomain/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://localhost.localdomain/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://130-229-16-238-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://130-229-16-238-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130-229-16-238-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130-229-16-238-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://130-229-16-238-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://130-229-16-238-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130-229-16-238-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130-229-16-238-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130-229-16-238-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://130-229-16-238-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130-229-16-238-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://130-229-16-238-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://130-229-16-238-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://130-229-16-238-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
 
-</md:EntityDescriptor>
\ No newline at end of file
+</md:EntityDescriptor>