1 files changed, 48 insertions, 40 deletions
diff --git a/swamid-2.0/artisan-idp-proxy.sunet.se-sp.xml b/swamid-2.0/artisan-idp-proxy.sunet.se-sp.xml
index c38b86b1..1468128b 100644
--- a/swamid-2.0/artisan-idp-proxy.sunet.se-sp.xml
+++ b/swamid-2.0/artisan-idp-proxy.sunet.se-sp.xml
@@ -6,15 +6,13 @@
     </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" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <ns0:SPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <ns2:DiscoveryResponse xmlns:ns2="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://artisan-idp-proxy.sunet.se/Saml2SP/disco" index="1"/>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://artisan-idp-proxy.sunet.se/Saml2SP/disco" index="1"/>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">SUNET SURVEY PROXY</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">SUNET SURVEY PROXY</mdui:DisplayName>
@@ -22,12 +20,16 @@
         <mdui:Description xml:lang="en">SUNET SURVEY PROXY</mdui:Description>
         <mdui:Logo xml:lang="sv" height="205" width="256">https://static.sunet.se/images/sunet256.png</mdui:Logo>
         <mdui:Logo xml:lang="en" height="205" width="256">https://static.sunet.se/images/sunet256.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">https://www.sunet.se/services/samverkan/enkatverktyg</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://www.sunet.se/services/samverkan/enkatverktyg</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.sunet.se/services/samverkan/enkatverktyg</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.sunet.se/services/samverkan/enkatverktyg</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="signing">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIIFEzCCAvugAwIBAgIUBGH1vtek1NlSdBt0H5KzT7TQmOMwDQYJKoZIhvcNAQEL
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFEzCCAvugAwIBAgIUBGH1vtek1NlSdBt0H5KzT7TQmOMwDQYJKoZIhvcNAQEL
 BQAwGTEXMBUGA1UEAwwOc2F0b3NhX2JhY2tlbmQwHhcNMjAwOTExMTA0MTIzWhcN
 MzAwOTA5MTA0MTIzWjAZMRcwFQYDVQQDDA5zYXRvc2FfYmFja2VuZDCCAiIwDQYJ
 KoZIhvcNAQEBBQADggIPADCCAgoCggIBAMGrD/R6GNn0kxan4EH78Ka8wAE6K+EF
@@ -55,14 +57,14 @@ lEelRdbYl8IvJNSLwcAxwYTwKZT6fN/lXVdSFHk7ZRp134DyevJ2IjO8u1hwCyBy
 pIAKcO/5NatCLyQJvBwWy9glqABeu3Wg/YWAwR7IAmFH0Eav93pUSTbtTxdvA5Ts
 OviEv96zT8eXdIeBMUt+hAPSoJh/iy6nZheR00UfugrWd8QcEEPwS5VG1TvUFriS
 TXlRPha6EA==
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="encryption">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIIFEzCCAvugAwIBAgIUBGH1vtek1NlSdBt0H5KzT7TQmOMwDQYJKoZIhvcNAQEL
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFEzCCAvugAwIBAgIUBGH1vtek1NlSdBt0H5KzT7TQmOMwDQYJKoZIhvcNAQEL
 BQAwGTEXMBUGA1UEAwwOc2F0b3NhX2JhY2tlbmQwHhcNMjAwOTExMTA0MTIzWhcN
 MzAwOTA5MTA0MTIzWjAZMRcwFQYDVQQDDA5zYXRvc2FfYmFja2VuZDCCAiIwDQYJ
 KoZIhvcNAQEBBQADggIPADCCAgoCggIBAMGrD/R6GNn0kxan4EH78Ka8wAE6K+EF
@@ -90,25 +92,31 @@ lEelRdbYl8IvJNSLwcAxwYTwKZT6fN/lXVdSFHk7ZRp134DyevJ2IjO8u1hwCyBy
 pIAKcO/5NatCLyQJvBwWy9glqABeu3Wg/YWAwR7IAmFH0Eav93pUSTbtTxdvA5Ts
 OviEv96zT8eXdIeBMUt+hAPSoJh/iy6nZheR00UfugrWd8QcEEPwS5VG1TvUFriS
 TXlRPha6EA==
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</ns0:NameIDFormat>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://artisan-idp-proxy.sunet.se/Saml2SP/acs/post" index="1"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://artisan-idp-proxy.sunet.se/Saml2SP/acs/redirect" index="2"/>
-  </ns0:SPSSODescriptor>
-  <ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
-    <ns0:OrganizationName xml:lang="en">SUNET Survey</ns0:OrganizationName>
-    <ns0:OrganizationDisplayName xml:lang="en">SUNET Survey</ns0:OrganizationDisplayName>
-    <ns0:OrganizationURL xml:lang="en">https://sunet.se</ns0:OrganizationURL>
-  </ns0:Organization>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <ns0:GivenName>Technical</ns0:GivenName>
-    <ns0:EmailAddress>mailto:noc@sunet.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <ns0:GivenName>Support</ns0:GivenName>
-    <ns0:EmailAddress>mailto:noc@sunet.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://artisan-idp-proxy.sunet.se/Saml2SP/acs/post" index="1"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SUNET</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">SUNET</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SUNET</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">SUNET</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SUNET NOC</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SUNET NOC</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SUNET NOC</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>