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

4 files changed, 2 insertions, 51 deletions

diff --git a/swamid-2.0/login.mynetworkglobal.com-simplesaml-module.php-saml-sp-metadata.php-mynetwork-sp.xml b/swamid-2.0/login.mynetworkglobal.com-simplesaml-module.php-saml-sp-metadata.php-mynetwork-sp.xml
index a26a5e92..9615686a 100644
--- a/swamid-2.0/login.mynetworkglobal.com-simplesaml-module.php-saml-sp-metadata.php-mynetwork-sp.xml
+++ b/swamid-2.0/login.mynetworkglobal.com-simplesaml-module.php-saml-sp-metadata.php-mynetwork-sp.xml
@@ -46,6 +46,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>Per</md:GivenName>
     <md:SurName>Newberg</md:SurName>
-    <md:EmailAddress>mailto:webmaster@mynetwork.se</md:EmailAddress>
+    <md:EmailAddress>mailto:support@varbi.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/login.varbi.com-simplesaml-module.php-saml-sp-metadata.php-varbi-sp.xml b/swamid-2.0/login.varbi.com-simplesaml-module.php-saml-sp-metadata.php-varbi-sp.xml
index f99e07de..2f845b63 100644
--- a/swamid-2.0/login.varbi.com-simplesaml-module.php-saml-sp-metadata.php-varbi-sp.xml
+++ b/swamid-2.0/login.varbi.com-simplesaml-module.php-saml-sp-metadata.php-varbi-sp.xml
@@ -46,6 +46,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>Per</md:GivenName>
     <md:SurName>Newberg</md:SurName>
-    <md:EmailAddress>mailto:webmaster@mynetwork.se</md:EmailAddress>
+    <md:EmailAddress>mailto:support@varbi.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/lu.exigus.com-simplesaml-module.php-saml-sp-metadata.php-lu.xml b/swamid-2.0/lu.exigus.com-simplesaml-module.php-saml-sp-metadata.php-lu.xml
deleted file mode 100644
index 04d2a5ae..00000000
--- a/swamid-2.0/lu.exigus.com-simplesaml-module.php-saml-sp-metadata.php-lu.xml
+++ /dev/null
@@ -1,48 +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://lu.exigus.com/simplesaml/module.php/saml/sp/metadata.php/lu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="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">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Lunds universitets bildbank</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Lund University's image bank</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Exigus, bildbank för Lunds universitet</mdui:Description>
-        <mdui:Description xml:lang="en">Exigus, image bank for Lund University</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID9DCCAtygAwIBAgIJAKhSRFvQgg44MA0GCSqGSIb3DQEBBQUAMFkxCzAJBgNVBAYTAlNFMRIwEAYDVQQKEwlFeGlndXMgQUIxEzARBgNVBAMTCmV4aWd1cy5jb20xITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRAZXhpZ3VzLmNvbTAeFw0xMzEwMDQwODA4MzNaFw0yMzEwMDQwODA4MzNaMFkxCzAJBgNVBAYTAlNFMRIwEAYDVQQKEwlFeGlndXMgQUIxEzARBgNVBAMTCmV4aWd1cy5jb20xITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRAZXhpZ3VzLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOCrbgFGMTOe5zn4gDyxI+wwkl6kPaC6BcIS9nn7S2S3VrYzo2aSzTvwfU5vg5giqyGochzqmbP6OOI2rKDSbK8+pDB5cLc6SgNgVO1m8fHnYkmxGlVyiRlZem34ar7fiFKXY/zrxQOdOvPI/4dV9xQRahhCHrZLOh8fWk6oPjmbGO0ml0JTHpPoYIFP7D/akY/KnIlsB42kNOLk8sNQOMUQYmBNTVrKG0Aqptebo2IWcYUEioZ8YKJQmDOUzaidzKuvkidpDKAUCyT+mmqwXgf+GYSZkNz9yrQHEzl843EVf11xExqHgFHnsGdrfq0vtKK/kTmjR+QCSUdBotPSlM8CAwEAAaOBvjCBuzAdBgNVHQ4EFgQUTPLmY2W1VZlDn7UGoVt/wVbzkIYwgYsGA1UdIwSBgzCBgIAUTPLmY2W1VZlDn7UGoVt/wVbzkIahXaRbMFkxCzAJBgNVBAYTAlNFMRIwEAYDVQQKEwlFeGlndXMgQUIxEzARBgNVBAMTCmV4aWd1cy5jb20xITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRAZXhpZ3VzLmNvbYIJAKhSRFvQgg44MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEOZfA+vz6VvQiBAF+0kLEXhoxye4MiOEaXBvvPnYAo5tFwnzCUpAMi+iFnnTXkbO6HKo3801CVCAoihD7V8biik8rPgLUe9/dU44F/UxBTa7386tXJSHLOZvTCiliuBljMk7Ysk041+z8+QkixJbe3lZiXwJhbuiPxYqgORWNPA6P4zQ/yn9G0elmsCazX01YUYiCHogAYROpRPG39IbtK0/kVh0RhDzpftO5Bsr3lY+1EK5HSgA9LV+YtLt9tQSnzm/2YjfFF1/mtraOD+fXEiRzgvRgZMVgpDrzFQ7S5V0mt1DwSJqnwDPzzI20qyyuEiwHwtcneW5+53XvKzlyw=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID9DCCAtygAwIBAgIJAKhSRFvQgg44MA0GCSqGSIb3DQEBBQUAMFkxCzAJBgNVBAYTAlNFMRIwEAYDVQQKEwlFeGlndXMgQUIxEzARBgNVBAMTCmV4aWd1cy5jb20xITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRAZXhpZ3VzLmNvbTAeFw0xMzEwMDQwODA4MzNaFw0yMzEwMDQwODA4MzNaMFkxCzAJBgNVBAYTAlNFMRIwEAYDVQQKEwlFeGlndXMgQUIxEzARBgNVBAMTCmV4aWd1cy5jb20xITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRAZXhpZ3VzLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOCrbgFGMTOe5zn4gDyxI+wwkl6kPaC6BcIS9nn7S2S3VrYzo2aSzTvwfU5vg5giqyGochzqmbP6OOI2rKDSbK8+pDB5cLc6SgNgVO1m8fHnYkmxGlVyiRlZem34ar7fiFKXY/zrxQOdOvPI/4dV9xQRahhCHrZLOh8fWk6oPjmbGO0ml0JTHpPoYIFP7D/akY/KnIlsB42kNOLk8sNQOMUQYmBNTVrKG0Aqptebo2IWcYUEioZ8YKJQmDOUzaidzKuvkidpDKAUCyT+mmqwXgf+GYSZkNz9yrQHEzl843EVf11xExqHgFHnsGdrfq0vtKK/kTmjR+QCSUdBotPSlM8CAwEAAaOBvjCBuzAdBgNVHQ4EFgQUTPLmY2W1VZlDn7UGoVt/wVbzkIYwgYsGA1UdIwSBgzCBgIAUTPLmY2W1VZlDn7UGoVt/wVbzkIahXaRbMFkxCzAJBgNVBAYTAlNFMRIwEAYDVQQKEwlFeGlndXMgQUIxEzARBgNVBAMTCmV4aWd1cy5jb20xITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRAZXhpZ3VzLmNvbYIJAKhSRFvQgg44MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEOZfA+vz6VvQiBAF+0kLEXhoxye4MiOEaXBvvPnYAo5tFwnzCUpAMi+iFnnTXkbO6HKo3801CVCAoihD7V8biik8rPgLUe9/dU44F/UxBTa7386tXJSHLOZvTCiliuBljMk7Ysk041+z8+QkixJbe3lZiXwJhbuiPxYqgORWNPA6P4zQ/yn9G0elmsCazX01YUYiCHogAYROpRPG39IbtK0/kVh0RhDzpftO5Bsr3lY+1EK5HSgA9LV+YtLt9tQSnzm/2YjfFF1/mtraOD+fXEiRzgvRgZMVgpDrzFQ7S5V0mt1DwSJqnwDPzzI20qyyuEiwHwtcneW5+53XvKzlyw=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lu.exigus.com/simplesaml/module.php/saml/sp/saml2-logout.php/lu"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lu.exigus.com/simplesaml/module.php/saml/sp/saml2-acs.php/lu" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lu.exigus.com/simplesaml/module.php/saml/sp/saml1-acs.php/lu" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lu.exigus.com/simplesaml/module.php/saml/sp/saml2-acs.php/lu" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lu.exigus.com/simplesaml/module.php/saml/sp/saml1-acs.php/lu/artifact" index="3"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Pontus</md:GivenName>
-    <md:SurName>Uggla</md:SurName>
-    <md:EmailAddress>mailto:pontus@exigus.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 0fc8c7d8..7861e7df 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -310,7 +310,6 @@
   <xi:include href="swamid-2.0/internt.geol.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/play.hkr.se.xml"/>
   <xi:include href="swamid-2.0/play.smdb.kb.se.xml"/>
-  <xi:include href="swamid-2.0/lu.exigus.com-simplesaml-module.php-saml-sp-metadata.php-lu.xml"/>
   <xi:include href="swamid-2.0/account.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/dnt.crc.med.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/secure.port.se-shibboleth.xml"/>