From 006738b23dba5563cbf39d8a004d25775456be8e Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Wed, 23 Nov 2022 12:28:52 +0100 Subject: [PATCH] Fix config and sample groups for LDAP deployment example The setup was configured to use a mix of the 'groupOfNames' and 'groupOfUniqueNames' objectclasses/attributetypes for groups. This aligns the configuration and sample data to use just'groupOfNames'. Closes: #5085 --- .../config/ldap/ldif/30_groups.ldif | 60 +++++++------------ .../ocis_ldap/config/ldap/ldif/30_groups.ldif | 60 +++++++------------ .../examples/ocis_ldap/docker-compose.yml | 2 +- 3 files changed, 45 insertions(+), 77 deletions(-) diff --git a/deployments/examples/oc10_ocis_parallel/config/ldap/ldif/30_groups.ldif b/deployments/examples/oc10_ocis_parallel/config/ldap/ldif/30_groups.ldif index 8617b977f4..a43edf133d 100644 --- a/deployments/examples/oc10_ocis_parallel/config/ldap/ldif/30_groups.ldif +++ b/deployments/examples/oc10_ocis_parallel/config/ldap/ldif/30_groups.ldif @@ -3,95 +3,79 @@ objectClass: organizationalUnit ou: groups dn: cn=users,ou=groups,dc=owncloud,dc=com -objectClass: groupOfUniqueNames -objectClass: posixGroup +objectClass: groupOfNames objectClass: ownCloud objectClass: top cn: users description: Users -gidNumber: 30000 ownCloudUUID:: NTA5YTlkY2QtYmIzNy00ZjRmLWEwMWEtMTlkY2EyN2Q5Y2Zh -uniqueMember: uid=einstein,ou=users,dc=owncloud,dc=com -uniqueMember: uid=marie,ou=users,dc=owncloud,dc=com -uniqueMember: uid=richard,ou=users,dc=owncloud,dc=com -uniqueMember: uid=moss,ou=users,dc=owncloud,dc=com -uniqueMember: uid=admin,ou=users,dc=owncloud,dc=com +member: uid=einstein,ou=users,dc=owncloud,dc=com +member: uid=marie,ou=users,dc=owncloud,dc=com +member: uid=richard,ou=users,dc=owncloud,dc=com +member: uid=moss,ou=users,dc=owncloud,dc=com +member: uid=admin,ou=users,dc=owncloud,dc=com dn: cn=sailing-lovers,ou=groups,dc=owncloud,dc=com -objectClass: groupOfUniqueNames -objectClass: posixGroup +objectClass: groupOfNames objectClass: ownCloud objectClass: top cn: sailing-lovers description: Sailing lovers -gidNumber: 30001 ownCloudUUID:: NjA0MGFhMTctOWM2NC00ZmVmLTliZDAtNzcyMzRkNzFiYWQw -uniqueMember: uid=einstein,ou=users,dc=owncloud,dc=com +member: uid=einstein,ou=users,dc=owncloud,dc=com dn: cn=violin-haters,ou=groups,dc=owncloud,dc=com -objectClass: groupOfUniqueNames -objectClass: posixGroup +objectClass: groupOfNames objectClass: ownCloud objectClass: top cn: violin-haters description: Violin haters -gidNumber: 30002 ownCloudUUID:: ZGQ1OGU1ZWMtODQyZS00OThiLTg4MDAtNjFmMmVjNmY5MTFm -uniqueMember: uid=einstein,ou=users,dc=owncloud,dc=com +member: uid=einstein,ou=users,dc=owncloud,dc=com dn: cn=radium-lovers,ou=groups,dc=owncloud,dc=com -objectClass: groupOfUniqueNames -objectClass: posixGroup +objectClass: groupOfNames objectClass: ownCloud objectClass: top cn: radium-lovers description: Radium lovers -gidNumber: 30003 ownCloudUUID:: N2I4N2ZkNDktMjg2ZS00YTVmLWJhZmQtYzUzNWQ1ZGQ5OTdh -uniqueMember: uid=marie,ou=users,dc=owncloud,dc=com +member: uid=marie,ou=users,dc=owncloud,dc=com dn: cn=polonium-lovers,ou=groups,dc=owncloud,dc=com -objectClass: groupOfUniqueNames -objectClass: posixGroup +objectClass: groupOfNames objectClass: ownCloud objectClass: top cn: polonium-lovers description: Polonium lovers -gidNumber: 30004 ownCloudUUID:: Y2VkYzIxYWEtNDA3Mi00NjE0LTg2NzYtZmE5MTY1ZjU5OGZm -uniqueMember: uid=marie,ou=users,dc=owncloud,dc=com +member: uid=marie,ou=users,dc=owncloud,dc=com dn: cn=quantum-lovers,ou=groups,dc=owncloud,dc=com -objectClass: groupOfUniqueNames -objectClass: posixGroup +objectClass: groupOfNames objectClass: ownCloud objectClass: top cn: quantum-lovers description: Quantum lovers -gidNumber: 30005 ownCloudUUID:: YTE3MjYxMDgtMDFmOC00YzMwLTg4ZGYtMmIxYTlkMWNiYTFh -uniqueMember: uid=richard,ou=users,dc=owncloud,dc=com +member: uid=richard,ou=users,dc=owncloud,dc=com dn: cn=philosophy-haters,ou=groups,dc=owncloud,dc=com -objectClass: groupOfUniqueNames -objectClass: posixGroup +objectClass: groupOfNames objectClass: ownCloud objectClass: top cn: philosophy-haters description: Philosophy haters -gidNumber: 30006 ownCloudUUID:: MTY3Y2JlZTItMDUxOC00NTVhLWJmYjItMDMxZmUwNjIxZTVk -uniqueMember: uid=richard,ou=users,dc=owncloud,dc=com +member: uid=richard,ou=users,dc=owncloud,dc=com dn: cn=physics-lovers,ou=groups,dc=owncloud,dc=com -objectClass: groupOfUniqueNames -objectClass: posixGroup +objectClass: groupOfNames objectClass: ownCloud objectClass: top cn: physics-lovers description: Physics lovers -gidNumber: 30007 ownCloudUUID:: MjYyOTgyYzEtMjM2Mi00YWZhLWJmZGYtOGNiZmVmNjRhMDZl -uniqueMember: uid=einstein,ou=users,dc=owncloud,dc=com -uniqueMember: uid=marie,ou=users,dc=owncloud,dc=com -uniqueMember: uid=richard,ou=users,dc=owncloud,dc=com +member: uid=einstein,ou=users,dc=owncloud,dc=com +member: uid=marie,ou=users,dc=owncloud,dc=com +member: uid=richard,ou=users,dc=owncloud,dc=com diff --git a/deployments/examples/ocis_ldap/config/ldap/ldif/30_groups.ldif b/deployments/examples/ocis_ldap/config/ldap/ldif/30_groups.ldif index 8617b977f4..a43edf133d 100644 --- a/deployments/examples/ocis_ldap/config/ldap/ldif/30_groups.ldif +++ b/deployments/examples/ocis_ldap/config/ldap/ldif/30_groups.ldif @@ -3,95 +3,79 @@ objectClass: organizationalUnit ou: groups dn: cn=users,ou=groups,dc=owncloud,dc=com -objectClass: groupOfUniqueNames -objectClass: posixGroup +objectClass: groupOfNames objectClass: ownCloud objectClass: top cn: users description: Users -gidNumber: 30000 ownCloudUUID:: NTA5YTlkY2QtYmIzNy00ZjRmLWEwMWEtMTlkY2EyN2Q5Y2Zh -uniqueMember: uid=einstein,ou=users,dc=owncloud,dc=com -uniqueMember: uid=marie,ou=users,dc=owncloud,dc=com -uniqueMember: uid=richard,ou=users,dc=owncloud,dc=com -uniqueMember: uid=moss,ou=users,dc=owncloud,dc=com -uniqueMember: uid=admin,ou=users,dc=owncloud,dc=com +member: uid=einstein,ou=users,dc=owncloud,dc=com +member: uid=marie,ou=users,dc=owncloud,dc=com +member: uid=richard,ou=users,dc=owncloud,dc=com +member: uid=moss,ou=users,dc=owncloud,dc=com +member: uid=admin,ou=users,dc=owncloud,dc=com dn: cn=sailing-lovers,ou=groups,dc=owncloud,dc=com -objectClass: groupOfUniqueNames -objectClass: posixGroup +objectClass: groupOfNames objectClass: ownCloud objectClass: top cn: sailing-lovers description: Sailing lovers -gidNumber: 30001 ownCloudUUID:: NjA0MGFhMTctOWM2NC00ZmVmLTliZDAtNzcyMzRkNzFiYWQw -uniqueMember: uid=einstein,ou=users,dc=owncloud,dc=com +member: uid=einstein,ou=users,dc=owncloud,dc=com dn: cn=violin-haters,ou=groups,dc=owncloud,dc=com -objectClass: groupOfUniqueNames -objectClass: posixGroup +objectClass: groupOfNames objectClass: ownCloud objectClass: top cn: violin-haters description: Violin haters -gidNumber: 30002 ownCloudUUID:: ZGQ1OGU1ZWMtODQyZS00OThiLTg4MDAtNjFmMmVjNmY5MTFm -uniqueMember: uid=einstein,ou=users,dc=owncloud,dc=com +member: uid=einstein,ou=users,dc=owncloud,dc=com dn: cn=radium-lovers,ou=groups,dc=owncloud,dc=com -objectClass: groupOfUniqueNames -objectClass: posixGroup +objectClass: groupOfNames objectClass: ownCloud objectClass: top cn: radium-lovers description: Radium lovers -gidNumber: 30003 ownCloudUUID:: N2I4N2ZkNDktMjg2ZS00YTVmLWJhZmQtYzUzNWQ1ZGQ5OTdh -uniqueMember: uid=marie,ou=users,dc=owncloud,dc=com +member: uid=marie,ou=users,dc=owncloud,dc=com dn: cn=polonium-lovers,ou=groups,dc=owncloud,dc=com -objectClass: groupOfUniqueNames -objectClass: posixGroup +objectClass: groupOfNames objectClass: ownCloud objectClass: top cn: polonium-lovers description: Polonium lovers -gidNumber: 30004 ownCloudUUID:: Y2VkYzIxYWEtNDA3Mi00NjE0LTg2NzYtZmE5MTY1ZjU5OGZm -uniqueMember: uid=marie,ou=users,dc=owncloud,dc=com +member: uid=marie,ou=users,dc=owncloud,dc=com dn: cn=quantum-lovers,ou=groups,dc=owncloud,dc=com -objectClass: groupOfUniqueNames -objectClass: posixGroup +objectClass: groupOfNames objectClass: ownCloud objectClass: top cn: quantum-lovers description: Quantum lovers -gidNumber: 30005 ownCloudUUID:: YTE3MjYxMDgtMDFmOC00YzMwLTg4ZGYtMmIxYTlkMWNiYTFh -uniqueMember: uid=richard,ou=users,dc=owncloud,dc=com +member: uid=richard,ou=users,dc=owncloud,dc=com dn: cn=philosophy-haters,ou=groups,dc=owncloud,dc=com -objectClass: groupOfUniqueNames -objectClass: posixGroup +objectClass: groupOfNames objectClass: ownCloud objectClass: top cn: philosophy-haters description: Philosophy haters -gidNumber: 30006 ownCloudUUID:: MTY3Y2JlZTItMDUxOC00NTVhLWJmYjItMDMxZmUwNjIxZTVk -uniqueMember: uid=richard,ou=users,dc=owncloud,dc=com +member: uid=richard,ou=users,dc=owncloud,dc=com dn: cn=physics-lovers,ou=groups,dc=owncloud,dc=com -objectClass: groupOfUniqueNames -objectClass: posixGroup +objectClass: groupOfNames objectClass: ownCloud objectClass: top cn: physics-lovers description: Physics lovers -gidNumber: 30007 ownCloudUUID:: MjYyOTgyYzEtMjM2Mi00YWZhLWJmZGYtOGNiZmVmNjRhMDZl -uniqueMember: uid=einstein,ou=users,dc=owncloud,dc=com -uniqueMember: uid=marie,ou=users,dc=owncloud,dc=com -uniqueMember: uid=richard,ou=users,dc=owncloud,dc=com +member: uid=einstein,ou=users,dc=owncloud,dc=com +member: uid=marie,ou=users,dc=owncloud,dc=com +member: uid=richard,ou=users,dc=owncloud,dc=com diff --git a/deployments/examples/ocis_ldap/docker-compose.yml b/deployments/examples/ocis_ldap/docker-compose.yml index 31fb754ae7..b5538240ee 100644 --- a/deployments/examples/ocis_ldap/docker-compose.yml +++ b/deployments/examples/ocis_ldap/docker-compose.yml @@ -66,7 +66,7 @@ services: LDAP_BIND_PASSWORD: ${LDAP_ADMIN_PASSWORD:-admin} LDAP_GROUP_BASE_DN: "dc=owncloud,dc=com" LDAP_GROUP_FILTER: "(objectclass=owncloud)" - LDAP_GROUP_OBJECTCLASS: "groupOfUniqueNames" + LDAP_GROUP_OBJECTCLASS: "groupOfNames" LDAP_USER_BASE_DN: "dc=owncloud,dc=com" LDAP_USER_FILTER: "(objectclass=owncloud)" LDAP_USER_OBJECTCLASS: "inetOrgPerson"