Resolves SWAMIDOPS-7224

2 files changed, 19 insertions, 18 deletions

diff --git a/swamid-2.0/dirg.org.umu.se-443-sp.xml b/swamid-2.0/dirg.org.umu.se-sp.xml
index 9645982a..cb44b252 100644
--- a/swamid-2.0/dirg.org.umu.se-443-sp.xml
+++ b/swamid-2.0/dirg.org.umu.se-sp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ns4="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ns5="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://dirg.org.umu.se:443/sp.xml">
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ns4="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ns5="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ns6="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://dirg.org.umu.se/sp.xml">
   <ns0:Extensions>
     <ns1:EntityAttributes>
       <ns2:Attribute Name="http://macedir.org/entity-category">
@@ -15,11 +15,12 @@
         <ns4:Description xml:lang="en">ITS - DIRG unit external webpage.</ns4:Description>
         <ns4:Logo height="50" width="60" xml:lang="en">https://dirg.org.umu.se/static/dirg_green_fp.png</ns4:Logo>
       </ns4:UIInfo>
+      <ns5:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dirg.org.umu.se/disco" index="1"/>
     </ns0:Extensions>
     <ns0:KeyDescriptor use="encryption">
-      <ns5:KeyInfo>
-        <ns5:X509Data>
-          <ns5:X509Certificate>MIICVzCCAcACCQCD0IEgR/GBozANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJz
+      <ns6:KeyInfo>
+        <ns6:X509Data>
+          <ns6:X509Certificate>MIICVzCCAcACCQCD0IEgR/GBozANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJz
 ZTELMAkGA1UECAwCQUMxDTALBgNVBAcMBFVtZWExDDAKBgNVBAoMA0lUUzEMMAoG
 A1UECwwDSVRTMQ0wCwYDVQQDDARESVJHMRowGAYJKoZIhvcNAQkBFgtkaXJnQHVt
 dS5zZTAeFw0xNDAyMDcxNDI3MDBaFw0xNTAyMDcxNDI3MDBaMHAxCzAJBgNVBAYT
@@ -32,14 +33,14 @@ l4qRZWZSwmXDvDeIinAxwkr4C/rK392TKfHMfej1hDL2IeCn5oY7Fl2DTjDTAjKd
 A6gAcjDA5Wqd0HTtpqkWqEbVKPtxI0pBnFy4J5CARk43R2yn1sHH/HRNTuTcZEmB
 xz6UWuCYykD4kDTwppQdXn4l3/RkA1NOLvSse3P3Db7JbK5EkjHRyWCRnhREloh9
 606LRX1Kc0uWKNEBRs6uN9VA9aiIHVHpRboU
-</ns5:X509Certificate>
-        </ns5:X509Data>
-      </ns5:KeyInfo>
+</ns6:X509Certificate>
+        </ns6:X509Data>
+      </ns6:KeyInfo>
     </ns0:KeyDescriptor>
     <ns0:KeyDescriptor use="signing">
-      <ns5:KeyInfo>
-        <ns5:X509Data>
-          <ns5:X509Certificate>MIICVzCCAcACCQCD0IEgR/GBozANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJz
+      <ns6:KeyInfo>
+        <ns6:X509Data>
+          <ns6:X509Certificate>MIICVzCCAcACCQCD0IEgR/GBozANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJz
 ZTELMAkGA1UECAwCQUMxDTALBgNVBAcMBFVtZWExDDAKBgNVBAoMA0lUUzEMMAoG
 A1UECwwDSVRTMQ0wCwYDVQQDDARESVJHMRowGAYJKoZIhvcNAQkBFgtkaXJnQHVt
 dS5zZTAeFw0xNDAyMDcxNDI3MDBaFw0xNTAyMDcxNDI3MDBaMHAxCzAJBgNVBAYT
@@ -52,16 +53,16 @@ l4qRZWZSwmXDvDeIinAxwkr4C/rK392TKfHMfej1hDL2IeCn5oY7Fl2DTjDTAjKd
 A6gAcjDA5Wqd0HTtpqkWqEbVKPtxI0pBnFy4J5CARk43R2yn1sHH/HRNTuTcZEmB
 xz6UWuCYykD4kDTwppQdXn4l3/RkA1NOLvSse3P3Db7JbK5EkjHRyWCRnhREloh9
 606LRX1Kc0uWKNEBRs6uN9VA9aiIHVHpRboU
-</ns5:X509Certificate>
-        </ns5:X509Data>
-      </ns5:KeyInfo>
+</ns6:X509Certificate>
+        </ns6:X509Data>
+      </ns6:KeyInfo>
     </ns0:KeyDescriptor>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dirg.org.umu.se:443/acsredirect" index="1"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dirg.org.umu.se:443/acspost" index="2"/>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dirg.org.umu.se/acsredirect" index="1"/>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dirg.org.umu.se/acspost" index="2"/>
   </ns0:SPSSODescriptor>
   <ns0:Organization>
-    <ns0:OrganizationName xml:lang="en">Umeå Universitet, ITS - DIRG</ns0:OrganizationName>
-    <ns0:OrganizationDisplayName xml:lang="se">Umeå Univeristet, ITS - DIRG</ns0:OrganizationDisplayName>
+    <ns0:OrganizationName xml:lang="en">Umeå University, ITS - DIRG</ns0:OrganizationName>
+    <ns0:OrganizationDisplayName xml:lang="se">Umeå univeristet, ITS - DIRG</ns0:OrganizationDisplayName>
     <ns0:OrganizationDisplayName xml:lang="en">Umeå University, ITS - DIRG</ns0:OrganizationDisplayName>
     <ns0:OrganizationURL xml:lang="en">https://dirg.org.umu.se/page/home</ns0:OrganizationURL>
   </ns0:Organization>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index ec3c5551..58cb9e6d 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -291,7 +291,7 @@
   <xi:include href="swamid-2.0/samltest.swamid.se-sp.xml"/>
   <xi:include href="swamid-2.0/meta.swamid.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/samltest.swamid.se-r_and_s-sp.xml"/>
-  <xi:include href="swamid-2.0/dirg.org.umu.se-443-sp.xml"/>
+  <xi:include href="swamid-2.0/dirg.org.umu.se-sp.xml"/>
   <xi:include href="swamid-2.0/activate-test.du.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/prep.math.su.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.alvin-portal.org-shibboleth.xml"/>