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

3 files changed, 35 insertions, 10 deletions

diff --git a/swamid-2.0/idp.bth.se-idp-shibboleth.xml b/swamid-2.0/idp.bth.se-idp-shibboleth.xml
index 44271f8f..b5fea9e1 100644
--- a/swamid-2.0/idp.bth.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.bth.se-idp-shibboleth.xml
@@ -4,11 +4,11 @@
     <Extensions>
       <shibmd:Scope regexp="false">bth.se</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Blekinge Tekkniska Högskola</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Blekinge Institute of Technology</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity provider för Blekinge Tekniska Högskola</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Blekinge Institute of Technology</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.bth.se/</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="sv">Blekinge Tekniska Högskola - Personal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Blekinge Institute of Technology - Personnel</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Blekinge Tekniska Högskola för personal</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Blekinge Institute of Technology for personnel</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.bth.se</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.bth.se/eng</mdui:InformationURL>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
@@ -92,19 +92,19 @@ n9Phr4P3FEL3YKQK+xQiKCJXUb5WgRI=
     <OrganizationURL xml:lang="en">http://www.bth.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
-    <Company>Blekinge Institute of Technology</Company>
+    <Company>Blekinge Institute of Technology- Personnel</Company>
     <SurName>IT Helpdesk</SurName>
     <EmailAddress>ithelpdesk@bth.se</EmailAddress>
     <TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="technical">
-    <Company>Blekinge Institute of Technology</Company>
+    <Company>Blekinge Institute of Technology- Personnel</Company>
     <SurName>IT Helpdesk</SurName>
     <EmailAddress>ithelpdesk@bth.se</EmailAddress>
     <TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
-    <Company>Blekinge Institute of Technology</Company>
+    <Company>Blekinge Institute of Technology- Personnel</Company>
     <SurName>IT Helpdesk</SurName>
     <EmailAddress>ithelpdesk@bth.se</EmailAddress>
     <TelephoneNumber>+46 455 381500</TelephoneNumber>
diff --git a/swamid-2.0/idp.student.bth.se-idp-shibboleth.xml b/swamid-2.0/idp.student.bth.se-idp-shibboleth.xml
index b83bd83e..a0595db7 100644
--- a/swamid-2.0/idp.student.bth.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.student.bth.se-idp-shibboleth.xml
@@ -6,8 +6,8 @@
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">Blekinge Tekniska Högskola - Studenter</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Blekinge Institute of Technology - Students</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">idp för Blekinge Tekniska Högskola - Studenter</mdui:Description>
-        <mdui:Description xml:lang="en">Identity provide for Blekinge Institute of Technology - Students</mdui:Description>
+        <mdui:Description xml:lang="sv">Identity Provider för Blekinge Tekniska Högskola för studenter</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Blekinge Institute of Technology for students</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.bth.se</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.bth.se/eng</mdui:InformationURL>
       </mdui:UIInfo>
diff --git a/swamid-2.0/shib1.oru.se-shibboleth.xml b/swamid-2.0/shib1.oru.se-shibboleth.xml
index cc778e2c..3fa97bfe 100644
--- a/swamid-2.0/shib1.oru.se-shibboleth.xml
+++ b/swamid-2.0/shib1.oru.se-shibboleth.xml
@@ -1,6 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib1.oru.se/shibboleth">
+  <md:Extensions>
+    <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/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Central webbtjänst för Örebro universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Central webservice for Örebro University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Central webbtjänst för Örebro universitet. Systemet aktiverar, återaktiverar och kursregistrerar nya och befintliga studentkonton samt är ombudssystem för lösenordsbyten. EduID används för att validera AL2-konton.</mdui:Description>
+        <mdui:Description xml:lang="en">Central webservice for Örebro University. The system is handling student activation, re-enrolls  students and registers existing and new student accounts aswell as act as intermediary for password changes. EduID is used to validate AL2 accounts.
+	</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:KeyName>shib1.oru.se</ds:KeyName>
@@ -95,4 +114,10 @@ Rqzek48aKj1lgjemCqPvuxaeTjFaQej9JLrxyQ1cWvsSYLuW4wnq4uvKdFRKr1hP
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib1.oru.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib1.oru.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Örebro University</md:Company>
+    <md:SurName>Jonny Ehrnberg</md:SurName>
+    <md:EmailAddress>itsupport@oru.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 19 303166</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>