Skip to content

Commit 6c95440

Browse files
authored
Merge pull request #11950 from kobergj/FixLDAPGroupCreation
[OCISDEV-599] Fix Group creation in multi-instance ocis
2 parents 9227c7f + 563bbf2 commit 6c95440

File tree

10 files changed

+285
-234
lines changed

10 files changed

+285
-234
lines changed

deployments/examples/ocis_multi/docker-compose.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ services:
8989
OCIS_LDAP_BIND_DN: "cn=admin,dc=owncloud,dc=com"
9090
OCIS_LDAP_BIND_PASSWORD: ${LDAP_ADMIN_PASSWORD:-admin}
9191
OCIS_LDAP_GROUP_BASE_DN: "ou=groups,dc=owncloud,dc=com"
92-
OCIS_LDAP_GROUP_OBJECTCLASS: "groupOfNames"
92+
GRAPH_LDAP_GROUP_CREATE_BASE_DN: "ou=groups-ec730a6c-1b63-4b45-b83b-9e2311afdf85,ou=groups,dc=owncloud,dc=com"
93+
OCIS_LDAP_GROUP_OBJECTCLASS: "owncloudGroup"
9394
OCIS_LDAP_USER_BASE_DN: "ou=users,dc=owncloud,dc=com"
9495
OCIS_LDAP_USER_OBJECTCLASS: "inetOrgPerson"
9596
LDAP_LOGIN_ATTRIBUTES: "uid"
@@ -106,6 +107,7 @@ services:
106107
OCIS_LDAP_GROUP_FILTER: "(&(objectclass=owncloud)(ownCloudMemberOf=ec730a6c-1b63-4b45-b83b-9e2311afdf85))"
107108
OCIS_LDAP_USER_MEMBER_ATTRIBUTE: "owncloudMemberOf"
108109
OCIS_LDAP_USER_GUEST_ATTRIBUTE: "ownCloudGuestOf"
110+
OCIS_LDAP_GROUP_AFFILIATION_ATTRIBUTE: "owncloudMemberOf"
109111
OCIS_LDAP_PRECISE_SEARCH_ATTRIBUTE: "cn"
110112
OCIS_LDAP_INSTANCE_MAPPER_ENABLED: true
111113
OCIS_LDAP_INSTANCE_MAPPER_BASE_DN: "dc=owncloud,dc=com"
@@ -117,8 +119,9 @@ services:
117119
OCIS_MULTI_INSTANCE_GUEST_ROLE: "user-light"
118120
OCIS_LDAP_CROSS_INSTANCE_REFERENCE_TEMPLATE: "{{.Username}}@{{.Instancename}}.owncloud.test"
119121
OCIS_LDAP_INSTANCE_URL_TEMPLATE: "https://{{.Instancename}}.owncloud.test"
120-
# Workaround needed to show external users - can be removed once fixed
121-
OCIS_USER_SEARCH_DISPLAYED_ATTRIBUTES: mail
122+
# FIXME: sync groups properly to keycloak and remove the next line
123+
PROXY_AUTOPROVISION_CLAIM_GROUPS: ""
124+
# specific for deployment example
122125
PROXY_ROLE_ASSIGNMENT_OIDC_CLAIM: ownCloudRole
123126
volumes:
124127
- ./config/ocis/banned-password-list.txt:/etc/ocis/banned-password-list.txt

0 commit comments

Comments
 (0)