Merge branch 'master' of https://github.com/OpenConext/OpenConext-deploy

Author: quartje

group_vars/prod.yml

@@ -301,6 +301,28 @@ voot:
         name: "SURFsara",
         timeoutMillis: 3000
       }
+    - {
+        type: "open_social",
+        url: "https://groupprovider.surf.nl",
+        credentials: {
+          username: "conext",
+          secret: "{{ external_group_provider_secrets.surf }}"
+        },
+        schacHomeOrganization: "surf.nl",
+        name: "SURF",
+        timeoutMillis: 3000
+      }
+    - {
+        type: "open_social",
+        url: "https://groupprovider.sans-ec.nl",
+        credentials: {
+          username: "conext",
+          secret: "{{ external_group_provider_secrets.sans }}"
+        },
+        schacHomeOrganization: "sans-ec.nl",
+        name: "SaNS",
+        timeoutMillis: 3000
+      }
 
 voot_version: 1.6.1
 

roles/janus/templates/janus/config/config_janus_core.j2.yml

@@ -80,6 +80,8 @@ janus_service_registry_core:
         eduPersonEntitlement:
             name: 'urn:mace:dir:attribute-def:eduPersonEntitlement'
             specify_values: true
+        eduPersonOrcid:
+            name: 'urn:mace:dir:attribute-def:eduPersonOrcid'
         isMemberOf:
             name: 'urn:mace:dir:attribute-def:isMemberOf'
             specify_values: true