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

1 files changed, 23 insertions, 16 deletions

diff --git a/swamid-2.0/idp-v2.konstfack.se-adfs-services-trust.xml b/swamid-2.0/idp-v2.konstfack.se-adfs-services-trust.xml
index 8bece47e..efdd293a 100644
--- a/swamid-2.0/idp-v2.konstfack.se-adfs-services-trust.xml
+++ b/swamid-2.0/idp-v2.konstfack.se-adfs-services-trust.xml
@@ -9,9 +9,9 @@
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
       </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -20,21 +20,21 @@
       <shibmd:Scope regexp="false">konstfack.se</shibmd:Scope>
       <shibmd:Scope regexp="false">student.konstfack.se</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Konstfack</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Konstfack</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">University of Arts, Crafts and Design</mdui:Description>
         <mdui:Description xml:lang="en">University of Arts, Crafts and Design</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.konstfack.se/sv/Om-Konstfack</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">University of Arts, Crafts and Design</mdui:Description>
+        <mdui:DisplayName xml:lang="en">Konstfack</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Konstfack</mdui:DisplayName>
         <mdui:InformationURL xml:lang="en">https://www.konstfack.se/en/About-Konstfack</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.konstfack.se/sv/Om-Konstfack/Om-webbplatsen</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.konstfack.se/en/About-Konstfack/About-the-website</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="sv" height="75" width="335">https://idp-v2.konstfack.se/adfs/portal/logo/logo.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">https://www.konstfack.se/sv/Om-Konstfack</mdui:InformationURL>
         <mdui:Logo xml:lang="en" height="75" width="335">https://idp-v2.konstfack.se/adfs/portal/logo/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="75" width="335">https://idp-v2.konstfack.se/adfs/portal/logo/logo.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.konstfack.se/en/About-Konstfack/About-the-website</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.konstfack.se/sv/Om-Konstfack/Om-webbplatsen</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
       <mdui:DiscoHints>
-        <mdui:IPHint>130.242.16.0/24</mdui:IPHint>
         <mdui:DomainHint>konstfack.se</mdui:DomainHint>
         <mdui:GeolocationHint>geo:59.2996777,17.9908419</mdui:GeolocationHint>
+        <mdui:IPHint>130.242.16.0/24</mdui:IPHint>
       </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="encryption">
@@ -51,6 +51,13 @@
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFTjCCAzagAwIBAgIQJch/ZhI9pY1NxYcXveYlcjANBgkqhkiG9w0BAQsFADAmMSQwIgYDVQQDDBtzaWduaW5nLmlkcC12Mi5rb25zdGZhY2suc2UwHhcNMjIwOTA2MTEyMzQxWhcNMzIwOTA2MTEzMzQwWjAmMSQwIgYDVQQDDBtzaWduaW5nLmlkcC12Mi5rb25zdGZhY2suc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCfDhFkELtCYNZzlhrNBV7i+j7tqC59aHa4eCMJmdK/Pj9H2aVNJawkBEaEPm9vXXPgn6mVSsSZwF/A/zdMWB/36T1TLty+x45Cv98ZkWpmGnRv76wz5Y8TD2bKb//DdnWeTh8Cu1aMdYv1zMgvLVKvLoTNwNl2hdxIrsX7E5tp9/T0IH+7AJdBPRIv3SsM6n1aitHfIO2xiF/neXt7yiduYsFPIhmMl8lO71mKds8D2wF17gOt4pZ9oo1bYsLpng9o6tE2jwkPdAE8Rf9fcd3VyOL4XsurTHV8Kz93NECTZ3MKyPT4nxtR+m4jSqdVdw7Gr1GPdU2LUMbhyMnk5ZuOoNxpmARwavDEGfNxoUPAqJxkzudHsgOeN1L8mmc46tpPImVBRw0AeCD4D+nS2x5ARrwC3RkM1dU3GMVrpF/uBgjhtlg32C/vy+uLF4fZSpwdGN9l9FE3y7D3p6IlmmiqjXknzMVQhCjNVCjyQcZXJDMqJItHX6hYgmw+v9YufsHI/VT1JwBgEx2tWmOtknlgAfUdWxFf0pE90rLnQUW1fDCJ9Ph3IGEn9Efm0FGkytwEjW7wTgxScSljYyxDfFba4Gk4Ic50Ezc60SsDFMuLc6H7JVN90NFHyPZUDnXOFaJDYJJLW7V0QongFarhZZt6bsIlWIFBsOARjLVnaUBMKQIDAQABo3gwdjAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMCYGA1UdEQQfMB2CG3NpZ25pbmcuaWRwLXYyLmtvbnN0ZmFjay5zZTAdBgNVHQ4EFgQUWcqKkFd75FyIN703VFV2jcsHwkowDQYJKoZIhvcNAQELBQADggIBAClcpYVeE09iGIgDDjqRd0C7eTaaCo5RusWbpgwjcvRli8d8sl8+dPIct3G4L9SHB2Fomh3QaPPgOstxyFqci3wwlwIX8RxrtMVwvcbMvZEk/TzqW6KDtr6FXj7soVWaEHd7WmHQfY9g9XSnAhA0ZQq8nQaovc2l8dziLFdEmTuf0490cjL+rP08qKZCcbJr7M7cnshZwPFpsFL1Ppvwi68iCe09TQROglfCxtPjF2RZwi2FQAs545EvNeeJ6m5XkYaadxGQ5/umALYhn9j5mqNdN2u8BdYYuJ5jkByVQrZGcZtYTIVKoXOcGOrAcQK68m7AmjwlZZRcxOZH1oz4M2d2YXYbfJHFkoDybbJg7mGX0jecGLks1WLe0ga/PksXiHkbpRu0FDD3xkRYxYpn9snKnxA0cN/Z7hy3QL7YRKAmCrLW3RryZKj+kLmBH6TxRsdGCxkdM5t5iqpfCPaX+yzkESF9W87JW0VYEgszRNFvkT6jI+xA95rxFLEWCDUUj5fpyXBLRU9l1EVwFW9JTKz3hy7k8+BzCYT1SdrzKUXh9UEH5v0LXPhiLyUHenjZskbcdc1ovqXt2rrvUVmVdv+On7VmBEM1ZFvodgyoZfoZWMOgdyHyu9Ul1gKuPY6cs5CRpQETbuWjjx6c2gCA+pKsE0c20cr15m760Xe5Zr5S</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
     <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-v2.konstfack.se/adfs/services/trust/artifactresolution" index="0"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
@@ -61,24 +68,24 @@
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
   </md:IDPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">Konstfack</md:OrganizationName>
     <md:OrganizationName xml:lang="en">Konstfack</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Konstfack</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="sv">Konstfack</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Konstfack</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.konstfack.se/</md:OrganizationURL>
+    <md:OrganizationDisplayName xml:lang="sv">Konstfack</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.konstfack.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.konstfack.se/</md:OrganizationURL>
   </md:Organization>
-  <md:ContactPerson contactType="administrative">
+  <md:ContactPerson contactType="support">
     <md:GivenName>IT Helpdesk</md:GivenName>
     <md:EmailAddress>mailto:IT-helpdesk@konstfack.se</md:EmailAddress>
     <md:TelephoneNumber>+46-8-4504100</md:TelephoneNumber>
   </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  <md:ContactPerson contactType="administrative">
     <md:GivenName>IT Helpdesk</md:GivenName>
     <md:EmailAddress>mailto:IT-helpdesk@konstfack.se</md:EmailAddress>
     <md:TelephoneNumber>+46-8-4504100</md:TelephoneNumber>
   </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  <md:ContactPerson contactType="technical">
     <md:GivenName>IT Helpdesk</md:GivenName>
     <md:EmailAddress>mailto:IT-helpdesk@konstfack.se</md:EmailAddress>
     <md:TelephoneNumber>+46-8-4504100</md:TelephoneNumber>