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

1 files changed, 14 insertions, 6 deletions

diff --git a/swamid-2.0/se-uppsala-shibboleth.moveon4.de-shibboleth.xml b/swamid-2.0/se-uppsala-shibboleth.moveon4.de-shibboleth.xml
index 9691c6ba..0adeaed7 100644
--- a/swamid-2.0/se-uppsala-shibboleth.moveon4.de-shibboleth.xml
+++ b/swamid-2.0/se-uppsala-shibboleth.moveon4.de-shibboleth.xml
@@ -21,6 +21,14 @@
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <Extensions xmlns="urn:mace:shibboleth:2.0:native:sp:config">
+          <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.swamid.se/category/research-and-education</samla:AttributeValue>
+              <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+            </samla:Attribute>
+          </mdattr:EntityAttributes>
+        </Extensions>
         <mdui:DisplayName xml:lang="en">Moveon SSO Service</mdui:DisplayName>
         <mdui:Description xml:lang="en">Moveon SSO Service Provider</mdui:Description>
         <mdui:Logo height="300" width="500">https://static.moveon4.com/sso/images/logo.png</mdui:Logo>
@@ -81,11 +89,11 @@ dO71JDwafFU98DsnJegXNKiDgIUuH9uCMKGrWU/PFdyLkgMBV3zKuul6MQg804XQ
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://se-uppsala-shibboleth.moveon4.de/Shibboleth.sso/SLO/POST"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://se-uppsala-shibboleth.moveon4.de/Shibboleth.sso/SLO/Redirect"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://se-uppsala-shibboleth.moveon4.de/Shibboleth.sso/SLO/SOAP"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://se-uppsala-shibboleth.moveon4.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://se-uppsala-shibboleth.moveon4.de/Shibboleth.sso/SAML/POST" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://se-uppsala-shibboleth.moveon4.de/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://se-uppsala-shibboleth.moveon4.de/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://se-uppsala-shibboleth.moveon4.de/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://se-uppsala-shibboleth.moveon4.de/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://se-uppsala-shibboleth.moveon4.de/Shibboleth.sso/SAML/POST" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://se-uppsala-shibboleth.moveon4.de/Shibboleth.sso/SAML2/Artifact" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://se-uppsala-shibboleth.moveon4.de/Shibboleth.sso/SAML2/ECP" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://se-uppsala-shibboleth.moveon4.de/Shibboleth.sso/SAML2/POST" index="9"/>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">qs-unisolution</md:OrganizationName>
@@ -97,7 +105,7 @@ dO71JDwafFU98DsnJegXNKiDgIUuH9uCMKGrWU/PFdyLkgMBV3zKuul6MQg804XQ
     <md:SurName>Gutsch</md:SurName>
     <md:EmailAddress>mailto:fiona.gutsch@qs-unisolution.com</md:EmailAddress>
   </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
+  <md:ContactPerson contactType="technical">
     <md:GivenName>Abdul</md:GivenName>
     <md:SurName>Jabbar</md:SurName>
     <md:EmailAddress>mailto:abdul.jabbar@zeptosystems.com</md:EmailAddress>