SWAMID-1143 SWAMID-1144 New medlem.ntkumea.se Remove medlem.ntk.umu.se

2 files changed, 8 insertions, 13 deletions

diff --git a/swamid-2.0/medlem.ntk.umu.se-auth-saml-metadata.xml b/swamid-2.0/medlem.ntkumea.se-auth-saml-metadata.xml
index 673a2d30..11eaa59a 100644
--- a/swamid-2.0/medlem.ntk.umu.se-auth-saml-metadata.xml
+++ b/swamid-2.0/medlem.ntkumea.se-auth-saml-metadata.xml
@@ -1,14 +1,9 @@
 <?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://medlem.ntk.umu.se/auth/saml/metadata">
+<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://medlem.ntkumea.se/auth/saml/metadata">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-11-15T14:04:37Z">
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-07-13T11:26:22Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</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" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
@@ -21,8 +16,8 @@
         <mdui:InformationURL xml:lang="en">https://www.montania.se/produkter/agera-medlem-en/</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://www.montania.se/medlemsportalen-privacy-policy/</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://www.montania.se/member-portal-privacy-policy/</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="sv" width="140" height="65">https://medlem.ntk.umu.se/images/logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" width="140" height="65">https://medlem.ntk.umu.se/images/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" width="140" height="65">https://medlem.ntkumea.se/images/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="140" height="65">https://medlem.ntkumea.se/images/logo.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
@@ -39,13 +34,13 @@
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://medlem.ntk.umu.se/auth/saml/logout"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://medlem.ntkumea.se/auth/saml/logout"/>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://medlem.ntk.umu.se/auth/saml/acs" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://medlem.ntkumea.se/auth/saml/acs" index="1"/>
     <md:AttributeConsumingService index="0">
       <md:ServiceName xml:lang="sv">AgeraMedlem</md:ServiceName>
       <md:ServiceName xml:lang="en">AgeraMedlem</md:ServiceName>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="norEduPersonNIN" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index f5e2fb8a..fe8046ef 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -34,7 +34,6 @@
   <xi:include href="swamid-2.0/medlem.konstkaren.se-auth-saml-metadata.xml"/>
   <xi:include href="swamid-2.0/medlem.lintek.liu.se-auth-saml-metadata.xml"/>
   <xi:include href="swamid-2.0/medlem.linnek.se-auth-saml-metadata.xml"/>
-  <xi:include href="swamid-2.0/medlem.ntk.umu.se-auth-saml-metadata.xml"/>
   <xi:include href="swamid-2.0/medlem.saks.se-auth-saml-metadata.xml"/>
   <xi:include href="swamid-2.0/medlem.stuff.liu.se-auth-saml-metadata.xml"/>
   <xi:include href="swamid-2.0/medlem.sus.su.se-auth-saml-metadata.xml"/>
@@ -685,4 +684,5 @@
   <xi:include href="swamid-2.0/cocov2-2.release-check.swamid.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/cocov2-3.release-check.swamid.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/misp-saas-idp-proxy.sunet.se-sp.xml"/>
+  <xi:include href="swamid-2.0/medlem.ntkumea.se-auth-saml-metadata.xml"/>
 </md:EntitiesDescriptor>