From 6f3bbe20a660aeb22033d00625c2be1a61c14834 Mon Sep 17 00:00:00 2001 From: Vassiliy Yegorov Date: Thu, 10 Mar 2022 08:57:16 +0700 Subject: [PATCH] add ldap --- .env.example | 12 ++++++++++++ docker-compose.yml | 22 +++++++++++----------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/.env.example b/.env.example index 609eff0..d35eb56 100644 --- a/.env.example +++ b/.env.example @@ -23,7 +23,19 @@ DOCKER_IMAGE_BACKUP=vasyakrg/gitlab-backup # LDAP settings LDAP_ENABLED=false +LDAP_LABEL=LDAP + +# "start_tls" if 389, or "simple_tls" if 636 +LDAP_METHOD=simple_tls +LDAP_ACTIVE_DIRECTORY=false +LDAP_HOST= +LDAP_PORT=636 +LDAP_UID=uid LDAP_PASS= +LDAP_VERIFY_SSL=true +LDAP_BASE="cn=users,cn=accounts,dc=domain,dc=com" +LDAP_USER_FILTER="(&(objectClass=posixaccount)(memberOf=cn=gitlab,cn=groups,cn=accounts,dc=domain,dc=com))" +LDAP_BIND_DN="uid=uidgitlab,cn=sysaccounts,cn=etc,dc=domain,dc=com" # SMTP settings SMTP_ENABLED=false diff --git a/docker-compose.yml b/docker-compose.yml index c14b6fa..9cf3a57 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -75,17 +75,17 @@ services: - IMAP_ENABLED=false - LDAP_ENABLED=${LDAP_ENABLED} - # - LDAP_LABEL=LDAP - # - LDAP_HOST=id1.domain.com - # - LDAP_PORT=636 - # - LDAP_UID=uid - # - LDAP_METHOD=simple_tls - # - LDAP_VERIFY_SSL=true - # - LDAP_ACTIVE_DIRECTORY=false - # - LDAP_BASE=cn=users,cn=accounts,dc=id,dc=domain,dc=com - # - LDAP_USER_FILTER=(&(objectClass=posixaccount)(memberOf=cn=gitlab,cn=groups,cn=accounts,dc=id,dc=domain,dc=com)) - # - LDAP_BIND_DN=uid=binddn,cn=sysaccounts,cn=etc,dc=id,dc=domain,dc=com - # - LDAP_PASS=${LDAP_PASS} + - LDAP_LABEL=${LDAP_LABEL} + - LDAP_HOST=${LDAP_HOST} + - LDAP_PORT=${LDAP_PORT} + - LDAP_UID=${LDAP_UID} + - LDAP_METHOD=${LDAP_METHOD} + - LDAP_VERIFY_SSL=${LDAP_VERIFY_SSL} + - LDAP_ACTIVE_DIRECTORY=${LDAP_ACTIVE_DIRECTORY} + - LDAP_BASE=${LDAP_BASE} + - LDAP_USER_FILTER=${LDAP_USER_FILTER} + - LDAP_BIND_DN=${LDAP_BIND_DN} + - LDAP_PASS=${LDAP_PASS} - GITLAB_REGISTRY_ENABLED=true - GITLAB_REGISTRY_HOST=${REGISTRY_HOST}