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

2 files changed, 21 insertions, 21 deletions

diff --git a/nya-1.0-testing.mxml b/nya-1.0-testing.mxml
index bb1ce901..ca97c771 100644
--- a/nya-1.0-testing.mxml
+++ b/nya-1.0-testing.mxml
@@ -22,7 +22,7 @@
   <xi:include href="nya-workshop/130.229.19.154.xml"/>
   <xi:include href="nya-workshop/130.229.19.126.xml"/>
   <xi:include href="nya-workshop/beskes.hgo.se.xml"/>
-  <xi:include href="nya-workshop/130.229.19.225.xml"/>
+  <xi:include href="nya-workshop/130.229.19.83.xml"/>
   <xi:include href="nya-workshop/vmtest005.ita.chalmers.se.xml"/>
   <xi:include href="nya-workshop/130.229.17.20.xml"/>
   <xi:include href="nya-workshop/130.229.17.145.xml"/>
diff --git a/nya-workshop/130.229.19.225.xml b/nya-workshop/130.229.19.83.xml
index 5f2510ce..4ac71968 100644
--- a/nya-workshop/130.229.19.225.xml
+++ b/nya-workshop/130.229.19.83.xml
@@ -1,41 +1,41 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://130-229-19-225-dhcp.ap-wlan.ki.se">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://130-229-19-83-dhcp.ap-wlan.ki.se">
   <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://130-229-19-225-dhcp.ap-wlan.ki.se/Shibboleth.sso/DS" index="1"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://130-229-19-83-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-19-225-dhcp.ap-wlan.ki.se</ds:KeyName>
+        <ds:KeyName>130-229-19-83-dhcp.ap-wlan.ki.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=130-229-19-225-dhcp.ap-wlan.ki.se</ds:X509SubjectName>
+          <ds:X509SubjectName>CN=130-229-19-83-dhcp.ap-wlan.ki.se</ds:X509SubjectName>
           <ds:X509Certificate>MIIDTTCCAjWgAwIBAgIJAOrsYrcpepCGMA0GCSqGSIb3DQEBBQUAMCwxKjAoBgNVBAMTITEzMC0yMjktMTktMjI1LWRoY3AuYXAtd2xhbi5raS5zZTAeFw0wOTA0MjExMzE0NThaFw0xOTA0MTkxMzE0NThaMCwxKjAoBgNVBAMTITEzMC0yMjktMTktMjI1LWRoY3AuYXAtd2xhbi5raS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKgG9jIH3qKJjYcQmv6TvJmUpoF3nH6OecGQsgyW2tjOV/Xwr5Ww4PN70ENO2+oWoRvJTM9CsX+h9naL6GA6A2GmyY8ZTteODJOPmICA5VkKcGMuuLQ84XYs2WmuaiEQ63kx9ZK/BL7NbswXS48t1JzFqVqpa8GahIBMcbsopf3ImkFJV0l2AlCFF+uUj1UvCitBvkPyWxj5mKfMHzVllRQw7N3AMBbjc219fOuwIKKVH14o/bSLKWvS2Asqaeq80WUrI3wbdsQz+1CpBvhYhnYlGX3Buek0Sp02q6RLMSmGjf6CBL4+AyImTZNobXTNPa2uqFIckNiphpm5EPHIgzECAwEAAaNyMHAwTwYDVR0RBEgwRoIhMTMwLTIyOS0xOS0yMjUtZGhjcC5hcC13bGFuLmtpLnNlhiExMzAtMjI5LTE5LTIyNS1kaGNwLmFwLXdsYW4ua2kuc2UwHQYDVR0OBBYEFEstf3iOTjXrmgddYtFZsxKN/TEHMA0GCSqGSIb3DQEBBQUAA4IBAQCL6zZhWOouupLeQxJVxmhu0Gwi95+uk0WtrdAuhh4oa3D7BOUy6tuEjQ6umZwF+hIZNBggDM5IoqCcz+MVlQEI/WOtFX6sN8p4uvu53fosdZltD4Eh/a051cc/f+ModjysaBVJ7n5jXgFWue7GlKl9fc/X29sC6FPE9EK3hEHg+sby3QU5llOGSRQl27AkzWIY8Y0zYW0nk/LvfoSH710KLZvcdzgnedMtGZo0kObavmcZtZnb2sxGaR3AuJCYE1elRRaCE103E3hovrhyrLLGQhoqq5PagPJT1NbaS4fYV48OrkuXtL1YwesB/C9K2xiq6Rxz5zGn4zsFaq3Dafai</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>130-229-19-225-dhcp.ap-wlan.ki.se</ds:KeyName>
+        <ds:KeyName>130-229-19-83-dhcp.ap-wlan.ki.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=130-229-19-225-dhcp.ap-wlan.ki.se</ds:X509SubjectName>
+          <ds:X509SubjectName>CN=130-229-19-83-dhcp.ap-wlan.ki.se</ds:X509SubjectName>
           <ds:X509Certificate>MIIDTTCCAjWgAwIBAgIJAOrsYrcpepCGMA0GCSqGSIb3DQEBBQUAMCwxKjAoBgNVBAMTITEzMC0yMjktMTktMjI1LWRoY3AuYXAtd2xhbi5raS5zZTAeFw0wOTA0MjExMzE0NThaFw0xOTA0MTkxMzE0NThaMCwxKjAoBgNVBAMTITEzMC0yMjktMTktMjI1LWRoY3AuYXAtd2xhbi5raS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKgG9jIH3qKJjYcQmv6TvJmUpoF3nH6OecGQsgyW2tjOV/Xwr5Ww4PN70ENO2+oWoRvJTM9CsX+h9naL6GA6A2GmyY8ZTteODJOPmICA5VkKcGMuuLQ84XYs2WmuaiEQ63kx9ZK/BL7NbswXS48t1JzFqVqpa8GahIBMcbsopf3ImkFJV0l2AlCFF+uUj1UvCitBvkPyWxj5mKfMHzVllRQw7N3AMBbjc219fOuwIKKVH14o/bSLKWvS2Asqaeq80WUrI3wbdsQz+1CpBvhYhnYlGX3Buek0Sp02q6RLMSmGjf6CBL4+AyImTZNobXTNPa2uqFIckNiphpm5EPHIgzECAwEAAaNyMHAwTwYDVR0RBEgwRoIhMTMwLTIyOS0xOS0yMjUtZGhjcC5hcC13bGFuLmtpLnNlhiExMzAtMjI5LTE5LTIyNS1kaGNwLmFwLXdsYW4ua2kuc2UwHQYDVR0OBBYEFEstf3iOTjXrmgddYtFZsxKN/TEHMA0GCSqGSIb3DQEBBQUAA4IBAQCL6zZhWOouupLeQxJVxmhu0Gwi95+uk0WtrdAuhh4oa3D7BOUy6tuEjQ6umZwF+hIZNBggDM5IoqCcz+MVlQEI/WOtFX6sN8p4uvu53fosdZltD4Eh/a051cc/f+ModjysaBVJ7n5jXgFWue7GlKl9fc/X29sC6FPE9EK3hEHg+sby3QU5llOGSRQl27AkzWIY8Y0zYW0nk/LvfoSH710KLZvcdzgnedMtGZo0kObavmcZtZnb2sxGaR3AuJCYE1elRRaCE103E3hovrhyrLLGQhoqq5PagPJT1NbaS4fYV48OrkuXtL1YwesB/C9K2xiq6Rxz5zGn4zsFaq3Dafai</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://130-229-19-225-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-19-225-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-19-225-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-19-225-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-19-225-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-19-225-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-19-225-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-19-225-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-19-225-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-19-225-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-19-225-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-19-225-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-19-225-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-19-225-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://130-229-19-83-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-19-83-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-19-83-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-19-83-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-19-83-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-19-83-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-19-83-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-19-83-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-19-83-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-19-83-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-19-83-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-19-83-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-19-83-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-19-83-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
 
 </md:EntityDescriptor>