Merge branch 'master' of git.swamid.se:swamid-metadata

2 files changed, 0 insertions, 98 deletions

diff --git a/swamid-2.0/moodle2.cs.lth.se-shibboleth.xml b/swamid-2.0/moodle2.cs.lth.se-shibboleth.xml
deleted file mode 100644
index eba12526..00000000
--- a/swamid-2.0/moodle2.cs.lth.se-shibboleth.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://moodle2.cs.lth.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <saml:AttributeValue>http://www.swamid.se/category/hei-service</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <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>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://moodle2.cs.lth.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://moodle2.cs.lth.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Moodle LU</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Moodle LU</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Moodle-system för grundutbildningen vid datavetenskap LU</mdui:Description>
-        <mdui:Description xml:lang="en">Moodle server for undergraduate education at the Dept. of Computer Science LU</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>moodle2.cs.lth.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=moodle2.cs.lth.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIID+jCCAmKgAwIBAgIJAIB/zDvMfMDGMA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNV
-BAMTEW1vb2RsZTIuY3MubHRoLnNlMB4XDTE2MDcwNjExNTYzMVoXDTI2MDcwNDEx
-NTYzMVowHDEaMBgGA1UEAxMRbW9vZGxlMi5jcy5sdGguc2UwggGiMA0GCSqGSIb3
-DQEBAQUAA4IBjwAwggGKAoIBgQDjAz0CtDALuS0YSf5TiMdsmTefW7sfOQiu0KGW
-YbivdVYPKdQH33oaiLY3TCzhra/t/kvFmHMIZV3t9HjZRcPTu1VfV9B0fzzppHQx
-gRirt/U7JpJ4B3Cek9emloqeNjt+h7h/HdWN2+PGCTqBdF7pD9nILYhsmEGh9Ixx
-1L7gT8WGw6/zFBsYAY4b4TYaF6918UazTDe/YyYsozw4TB97QVVM3Yv+N5dGjt9B
-tI2nER1WGjuc/BmVGUKGPAbFyB08ognayp+v/Tz8MxHOOxzAHinvMjUOL8pg0YIp
-+vO3bnV7Vk/mNiJQVmNTPrPYlnSpGZqfMcE5q/wM/A3YThengFS4sHpoVLnq71Ye
-9hw9wYVUQcjFJqhFzyFhCJr/mjJ4oiS5pVt2T6GeGKwgZX/bVqxP0qFmehFO54VG
-xp+XlfqTYGkjP0Xz2WWb6OJwb9dkmXcm9AtgXzsGIjKpk9c0QO+2oNvgh2jjzVVM
-MXZg1zrfBJ2TObXwfIltd7ByiYUCAwEAAaM/MD0wHAYDVR0RBBUwE4IRbW9vZGxl
-Mi5jcy5sdGguc2UwHQYDVR0OBBYEFC9nOw58wj/ZcWtzUqj3APcYUd85MA0GCSqG
-SIb3DQEBCwUAA4IBgQCd5xASLgNXGOxVJzi3ncbClzUTdbRBLzHKbGkIBxghl2Wr
-V0ZKvpjOOZNFY3tn3uNl+HhMe4NAhWd0CISPCUJLLqOiAunVfk7i72Twd5I2iXOy
-hMiqU8YpVIWspqgH7d6Kjf38OiFj3Lyutmr/rLMStgF5JAJhcmR3Vv5mKaAGOE0q
-ouSYiC3zrG848dMW+yFJdcPz0FiSzGUnkfTSq4lgNZo+AEiz53lXhRIqYj9YPfTo
-6VP5WG22+VjWS34EOtVBSiDg8vXsj2wa+6cQoadg+M+7HTwOk+p97rmEm8LZnk/J
-/RROVgRtn5bW8QXX/JY+1Mf9tVx5Rnx8O+pVTaKQq7X2IojCaPRz1jLNPXyO9duM
-7Z1Lz7yAYi7SY/7eINN6VW3LEnBbxGTubREWGVDlCxKpA+FR8pvLsWjqHIr63jDb
-seJid9r5t7STj/OwbGxgn4CXVuGJwCdTPWq+htEWsov7f4DurKGHgLkxuGoYplfk
-IPtsyyR5LVUuRnyvOaw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://moodle2.cs.lth.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://moodle2.cs.lth.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://moodle2.cs.lth.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://moodle2.cs.lth.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://moodle2.cs.lth.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://moodle2.cs.lth.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://moodle2.cs.lth.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://moodle2.cs.lth.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://moodle2.cs.lth.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://moodle2.cs.lth.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Peter</md:GivenName>
-    <md:SurName>Möller</md:SurName>
-    <md:EmailAddress>mailto:peter.moller@cs.lth.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index ceef208f..a15a2757 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -298,7 +298,6 @@
   <xi:include href="swamid-2.0/zeus.slu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/play.mdh.se.xml"/>
   <xi:include href="swamid-2.0/test-kau.hr.evry.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/moodle2.cs.lth.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/verify-l.myunidays.com-shibboleth.xml"/>
   <xi:include href="swamid-2.0/lists.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sam.control.lth.se-shibboleth.xml"/>