Resolves SWAMIDOPS-7538 Ny produktions idp Lunds Universitet

4 files changed, 30 insertions, 122 deletions

diff --git a/swamid-2.0/idp.lu.se-idp-shibboleth.xml b/swamid-2.0/idp.lu.se-idp-shibboleth.xml
index 6789982c..7fc971fa 100644
--- a/swamid-2.0/idp.lu.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.lu.se-idp-shibboleth.xml
@@ -3,6 +3,23 @@
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope regexp="false">lu.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Lunds universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Lund University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identitetstjänst för anställda och studenter vid Lunds universitet</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for employees and students at Lund University</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.lu.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.lunduniversity.lu.se</mdui:InformationURL>
+        <mdui:Logo xml:lang="sv" height="78" width="450">http://www2.ldc.lu.se/images/LU_swe_logo_450px.jpg</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="78" width="382">http://www2.ldc.lu.se/images/LU_eng_logo_382px.jpg</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">lu lth</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">lu lth</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>lu.se</mdui:DomainHint>
+        <mdui:DomainHint>lth.se</mdui:DomainHint>
+        <mdui:IPHint>130.235.0.0/16</mdui:IPHint>
+      </mdui:DiscoHints>
     </Extensions>
     <KeyDescriptor>
       <ds:KeyInfo>
@@ -76,4 +93,16 @@ u5Q6EI4vlsIGVG1PKyXIIIpgDyQ=
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
   </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">LU</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Lunds universitet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Lund University</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.lu.se/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>mailto:servicedesk@lu.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <EmailAddress>mailto:servicedesk@lu.se</EmailAddress>
+  </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/shibboleth.net.lu.se-idp-shibboleth.xml b/swamid-2.0/shibboleth.net.lu.se-idp-shibboleth.xml
deleted file mode 100644
index 836e749b..00000000
--- a/swamid-2.0/shibboleth.net.lu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://shibboleth.net.lu.se/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">lu.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Lunds universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Lund University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identitetstjänst för anställda och studenter vid Lunds universitet</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for employees and students at Lund University</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.lu.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.lunduniversity.lu.se</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="78" width="382">http://www.lu.se/profiles/lu/themes/lu_theme/logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="90" width="450">http://www2.ldc.lu.se/images/LU_eng_logo.jpg</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">lu lth</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">lu lth</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>lu.se</mdui:DomainHint>
-        <mdui:DomainHint>lth.se</mdui:DomainHint>
-        <mdui:IPHint>130.235.0.0/16</mdui:IPHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIUHLaZATm8vxcp1L4T0A9woLa1naIwDQYJKoZIhvcNAQEF
-BQAwHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC5uZXQubHUuc2UwHhcNMDkwOTMwMTE0
-ODIyWhcNMjkwOTMwMTE0ODIyWjAfMR0wGwYDVQQDExRzaGliYm9sZXRoLm5ldC5s
-dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI+ayJjc9XUuSABN
-M0X1KTfxv2arrhq8BV59iG1I9x3+Ga8lU0HH6zNNhT+ezRzxpSzeaTZZ+RcMAJS5
-e6whhw4R92Ei25CNYQKalUwfGRP3X3shGttUXG2wdZ+5ruSje7LVBE7bS2Ek05TJ
-fnMc3O+hc5XwbpXBii2KqosrIS7kiR5FuUPOrMWE4Sr1zoE8TFhOOv8zf9AOLE++
-k6aqas7TW9KCT7W8eyHNbcevEW8VhHpM49OGyzsjuJ8X6KkKNm1rSJgLEnnBy5y+
-LuiM4Ad5LjAgcdetxGm5VgpOx8h5prX5H0R0+C8A9Pm50VuNuv9h9iLI0z42Qemm
-3A5vgrUCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUc2hpYmJvbGV0aC5uZXQubHUuc2WG
-K2h0dHBzOi8vc2hpYmJvbGV0aC5uZXQubHUuc2UvaWRwL3NoaWJib2xldGgwHQYD
-VR0OBBYEFBlhR15/bdMDrBj/juMKUCB6K8TvMA0GCSqGSIb3DQEBBQUAA4IBAQBG
-XWHuslQiZD9yHWuQnMTYiB2cfp+82TNf0CIpoKzNPpcbUg4bX9NF8tyuCMAh6Tvf
-fNrkx++wXnbzjPmNKaryJDQGokz86pZdGRsNTt4dDDJSKCuSWP+kwCHf68/eklc1
-zB0hU4yYhR6vyoNz/UKA/jh6WyNPP6hoeq9XZinU+iMVIdRF5CPHM/tpbcdk6elP
-tJPbWzQInOy+wWmZvFnbN1qwvnlFkYNdH+R0QM2Pvkz7DUG2FqvsbtrKZvj/IHHh
-zlPsVj43MhXLVfk/EtgL8BmxjOW08uY3EDXl3hFwJB/XRURouZC3euoBgE41FMKb
-ADE1bHKRi4qX9DYfBN7g
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.net.lu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.net.lu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.net.lu.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.net.lu.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.net.lu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.net.lu.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">lu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIUHLaZATm8vxcp1L4T0A9woLa1naIwDQYJKoZIhvcNAQEF
-BQAwHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC5uZXQubHUuc2UwHhcNMDkwOTMwMTE0
-ODIyWhcNMjkwOTMwMTE0ODIyWjAfMR0wGwYDVQQDExRzaGliYm9sZXRoLm5ldC5s
-dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI+ayJjc9XUuSABN
-M0X1KTfxv2arrhq8BV59iG1I9x3+Ga8lU0HH6zNNhT+ezRzxpSzeaTZZ+RcMAJS5
-e6whhw4R92Ei25CNYQKalUwfGRP3X3shGttUXG2wdZ+5ruSje7LVBE7bS2Ek05TJ
-fnMc3O+hc5XwbpXBii2KqosrIS7kiR5FuUPOrMWE4Sr1zoE8TFhOOv8zf9AOLE++
-k6aqas7TW9KCT7W8eyHNbcevEW8VhHpM49OGyzsjuJ8X6KkKNm1rSJgLEnnBy5y+
-LuiM4Ad5LjAgcdetxGm5VgpOx8h5prX5H0R0+C8A9Pm50VuNuv9h9iLI0z42Qemm
-3A5vgrUCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUc2hpYmJvbGV0aC5uZXQubHUuc2WG
-K2h0dHBzOi8vc2hpYmJvbGV0aC5uZXQubHUuc2UvaWRwL3NoaWJib2xldGgwHQYD
-VR0OBBYEFBlhR15/bdMDrBj/juMKUCB6K8TvMA0GCSqGSIb3DQEBBQUAA4IBAQBG
-XWHuslQiZD9yHWuQnMTYiB2cfp+82TNf0CIpoKzNPpcbUg4bX9NF8tyuCMAh6Tvf
-fNrkx++wXnbzjPmNKaryJDQGokz86pZdGRsNTt4dDDJSKCuSWP+kwCHf68/eklc1
-zB0hU4yYhR6vyoNz/UKA/jh6WyNPP6hoeq9XZinU+iMVIdRF5CPHM/tpbcdk6elP
-tJPbWzQInOy+wWmZvFnbN1qwvnlFkYNdH+R0QM2Pvkz7DUG2FqvsbtrKZvj/IHHh
-zlPsVj43MhXLVfk/EtgL8BmxjOW08uY3EDXl3hFwJB/XRURouZC3euoBgE41FMKb
-ADE1bHKRi4qX9DYfBN7g
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.net.lu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.net.lu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">LU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Lunds universitet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Lund University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lu.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <Company>Lund University</Company>
-    <SurName>Eskil Swahn</SurName>
-    <EmailAddress>Eskil.Swahn@LDC.lu.se</EmailAddress>
-    <TelephoneNumber>+46 46 222 1323</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <Company>Lund University</Company>
-    <SurName>Johan Silverup</SurName>
-    <EmailAddress>Johan.Silverup@LDC.lu.se</EmailAddress>
-    <TelephoneNumber>+46 46 222 6313</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <Company>Lund University</Company>
-    <SurName>LU Support</SurName>
-    <EmailAddress>support@lu.se</EmailAddress>
-    <TelephoneNumber>+46 46 222 9000</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml
index 7bf24b5c..3175a545 100644
--- a/swamid-edugain-idp-1.0.mxml
+++ b/swamid-edugain-idp-1.0.mxml
@@ -31,7 +31,7 @@
   <xi:include href="swamid-2.0/idp.konstfack.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.rkh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.kmh.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/shibboleth.net.lu.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp.lu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.kva.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.esh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/kiidp.ki.se-idp-shibboleth.xml"/>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 5518bf59..664b226f 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -43,5 +43,4 @@
   <xi:include href="swamid-2.0/dev.idp.eduid.se-idp.xml"/>
   <xi:include href="swamid-2.0/pilot.idp.eduid.se-idp.xml"/>
   <xi:include href="swamid-2.0/a0251.srv.lu.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/idp.lu.se-idp-shibboleth.xml"/>
 </EntitiesDescriptor>