1 files changed, 26 insertions, 31 deletions
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.frhavn-gym.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.frhavn-gym.dk-simplesaml-saml2-idp-metadata.php.xml
index 6f8d7cc9..310aeca1 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.frhavn-gym.dk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.frhavn-gym.dk-simplesaml-saml2-idp-metadata.php.xml
@@ -1,41 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.frhavn-gym.dk/simplesaml/saml2/idp/metadata.php">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/wayf.frhavn-gym.dk/simplesaml/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2012-11-15T14:53:18Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2012-11-15T14:53:18Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <saml:Attribute Name="tags">
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frhavn-gym.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">frhavn-gym.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:DisplayName xml:lang="da">Frederikshavn Gymnasium &amp; HF-kursus</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Frederikshavn upper secondary school and HF-Course</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>frhavn-gym.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDAjCCAeoCAQcwDQYJKoZIhvcNAQELBQAwRzFFMEMGA1UEAww8aHR0cHM6Ly93
-YXlmLmZyaGF2bi1neW0uZGsvc2ltcGxlc2FtbC9zYW1sMi9pZHAvbWV0YWRhdGEu
-cGhwMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1OVowRzFFMEMGA1UEAww8
-aHR0cHM6Ly93YXlmLmZyaGF2bi1neW0uZGsvc2ltcGxlc2FtbC9zYW1sMi9pZHAv
-bWV0YWRhdGEucGhwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gM
-CmoQU7iOGfiCda4DnhIggst20fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz
-17JgyUDJonTwhjyA0CqPm5Pmn9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6e
-x2f1qD1gcpFgSTtADlZswec5WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVw
-DvupUPBS/2DJSZ1JEmkqi0hxctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmV
-Wr5+uSetnCXV4jnDEclACKeexl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu
-9zBTp7cp5ShLzsNQSQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQDEe2XDhPjDzgE9
-zLsGWFD/ZnxJRzVrAJqF3ix9To7XcPxlJXnmIFxkSpM7R7hJvxAWFBN8A7Lsits+
-MFweCoLCOnIeDdIIlM5fVXF0aRX3d8hPI6esnRDMQvtSM4fc/tGux4TGyqm9xNUL
-XE73vx0ig4cN/S+LB+aqvb29JWcL4UJEjF0KmDvoJImY812XYe53M5R/I44gpn+M
-VpnqVuENeOV3seRgxzxpfbA/TIjPtZLuNxeHR7dcGTvU631VfV7E/uxlSTZlxhCV
-CIASt2ITWU50Fzl2O8YDrRF6S0XehWsyr1uWfsDwZiZe9L5rHJSoEZMhPVWdnrtS
-DoLyd1u8
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMDUz
+NzAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDA1MzcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAKoCopYkn0UTrH8NJT+5
+YZytmHtnVQjHV2dm18WsZEGH1W1fXG2XItOFDgM6EhOTcC6UL6pwmu4+Kv1kwkCJ
+aKUrgOuI5svqF9jYrJCVPk5EvWwrpag9Rg9uehlk8VRPTEg+UG3cqej1PrUCXiJ6
+CN0mggib0MyzcrmfZn1DLRGK6yGlshYvp4tZL++9q8b3K3+CRxRj1vfhU8dS6pPD
+Vg1SvA5j67sIVExoBb7B6so4DRJstxgCqP8QELBsh6NrYp7SY9xelHI5Hlhrxi5U
+3gxj0DiIFth/5rAenLejQyrmqJmvjFr5g89hf8hnc6/Yh8wZ7i7vGwo+F2on4e7x
+YLE=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -51,9 +51,4 @@ DoLyd1u8
     <md:OrganizationURL xml:lang="da">http://frhavn-gym.dk</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.frhavn-gym.dk/english/</md:OrganizationURL>
   </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>WAYF</md:GivenName>
-    <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
-  </md:ContactPerson>
 </md:EntityDescriptor>