diff --git a/deployments/examples/oc10_ocis_parallel/docker-compose.yml b/deployments/examples/oc10_ocis_parallel/docker-compose.yml index c0bb7e917..bbdad332e 100644 --- a/deployments/examples/oc10_ocis_parallel/docker-compose.yml +++ b/deployments/examples/oc10_ocis_parallel/docker-compose.yml @@ -81,19 +81,19 @@ services: GRAPH_IDENTITY_BACKEND: ldap GRAPH_LDAP_SERVER_WRITE_ENABLED: "false" # LDAP bind - LDAP_URI: "ldaps://openldap" - LDAP_INSECURE: "true" - LDAP_BIND_DN: "cn=admin,dc=owncloud,dc=com" - LDAP_BIND_PASSWORD: ${LDAP_ADMIN_PASSWORD:-admin} + OCIS_LDAP_URI: "ldaps://openldap" + OCIS_LDAP_INSECURE: "true" + OCIS_LDAP_BIND_DN: "cn=admin,dc=owncloud,dc=com" + OCIS_LDAP_BIND_PASSWORD: ${LDAP_ADMIN_PASSWORD:-admin} # LDAP user settings PROXY_USER_OIDC_CLAIM: ocis.user.uuid # claim was added in Keycloak PROXY_USER_CS3_CLAIM: userid # equals LDAP_USER_SCHEMA_ID - LDAP_GROUP_BASE_DN: "ou=groups,dc=owncloud,dc=com" - LDAP_GROUP_SCHEMA_ID: "ownclouduuid" - LDAP_GROUP_FILTER: "(objectclass=owncloud)" - LDAP_USER_BASE_DN: "ou=users,dc=owncloud,dc=com" - LDAP_USER_SCHEMA_ID: "ownclouduuid" - LDAP_USER_FILTER: "(objectclass=owncloud)" + OCIS_LDAP_GROUP_BASE_DN: "ou=groups,dc=owncloud,dc=com" + OCIS_LDAP_GROUP_SCHEMA_ID: "ownclouduuid" + OCIS_LDAP_GROUP_FILTER: "(objectclass=owncloud)" + OCIS_LDAP_USER_BASE_DN: "ou=users,dc=owncloud,dc=com" + OCIS_LDAP_USER_SCHEMA_ID: "ownclouduuid" + OCIS_LDAP_USER_FILTER: "(objectclass=owncloud)" # ownCloudSQL storage driver STORAGE_USERS_DRIVER: "owncloudsql" STORAGE_USERS_OWNCLOUDSQL_DATADIR: "/mnt/data/files" diff --git a/deployments/examples/ocis_ldap/docker-compose.yml b/deployments/examples/ocis_ldap/docker-compose.yml index 428358432..f9056ef9b 100644 --- a/deployments/examples/ocis_ldap/docker-compose.yml +++ b/deployments/examples/ocis_ldap/docker-compose.yml @@ -60,17 +60,17 @@ services: command: [ "-c", "ocis init || true; ocis server" ] environment: # users/gropups from ldap - LDAP_URI: ldaps://ldap-server:1636 - LDAP_INSECURE: "true" - LDAP_BIND_DN: "cn=admin,dc=owncloud,dc=com" - LDAP_BIND_PASSWORD: ${LDAP_ADMIN_PASSWORD:-admin} - LDAP_GROUP_BASE_DN: "ou=groups,dc=owncloud,dc=com" - LDAP_GROUP_FILTER: "(objectclass=owncloud)" - LDAP_GROUP_OBJECTCLASS: "groupOfNames" - LDAP_USER_BASE_DN: "ou=users,dc=owncloud,dc=com" - LDAP_USER_FILTER: "(objectclass=owncloud)" - LDAP_USER_OBJECTCLASS: "inetOrgPerson" - LDAP_LOGIN_ATTRIBUTES: "uid" + OCIS_LDAP_URI: ldaps://ldap-server:1636 + OCIS_LDAP_INSECURE: "true" + OCIS_LDAP_BIND_DN: "cn=admin,dc=owncloud,dc=com" + OCIS_LDAP_BIND_PASSWORD: ${LDAP_ADMIN_PASSWORD:-admin} + OCIS_LDAP_GROUP_BASE_DN: "ou=groups,dc=owncloud,dc=com" + OCIS_LDAP_GROUP_FILTER: "(objectclass=owncloud)" + OCIS_LDAP_GROUP_OBJECTCLASS: "groupOfNames" + OCIS_LDAP_USER_BASE_DN: "ou=users,dc=owncloud,dc=com" + OCIS_LDAP_USER_FILTER: "(objectclass=owncloud)" + OCIS_LDAP_USER_OBJECTCLASS: "inetOrgPerson" + OCIS_LDAP_LOGIN_ATTRIBUTES: "uid" OCIS_ADMIN_USER_ID: "ddc2004c-0977-11eb-9d3f-a793888cd0f8" IDP_LDAP_LOGIN_ATTRIBUTE: "uid" IDP_LDAP_UUID_ATTRIBUTE: "ownclouduuid"