From 5ed1d05fe778c7222974cd8ed5e1d6e6ae88d1e9 Mon Sep 17 00:00:00 2001 From: Felix Bartels <1257835+fbartels@users.noreply.github.com> Date: Fri, 6 Mar 2020 09:59:31 +0100 Subject: [PATCH] transform LDAP_SERVER to LDAP_HOST (#355) SASL only wants the host, not the uri Fixes https://github.com/zokradonh/kopano-docker/issues/354 Signed-off-by: Felix Bartels --- docker-compose.mail.yml | 2 +- setup.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.mail.yml b/docker-compose.mail.yml index cfabba6..750c5ac 100644 --- a/docker-compose.mail.yml +++ b/docker-compose.mail.yml @@ -41,7 +41,7 @@ services: - SASLAUTHD_LDAP_FILTER=${SASLAUTHD_LDAP_FILTER} - SASLAUTHD_LDAP_PASSWORD=${LDAP_BIND_PW} - SASLAUTHD_LDAP_SEARCH_BASE=${LDAP_SEARCH_BASE} - - SASLAUTHD_LDAP_SERVER=${LDAP_SERVER} + - SASLAUTHD_LDAP_SERVER=${LDAP_HOST} - SASLAUTHD_MECHANISMS=ldap - SMTP_ONLY=1 - SSL_TYPE=self-signed diff --git a/setup.sh b/setup.sh index 593178c..9dcb1ab 100755 --- a/setup.sh +++ b/setup.sh @@ -264,6 +264,7 @@ LDAP_ORGANISATION="$LDAP_ORGANISATION" LDAP_DOMAIN=${FQDN%:*} LDAP_BASE_DN=$LDAP_BASE_DN LDAP_SERVER=$LDAP_SERVER +LDAP_HOST=${LDAP_SERVER#ldap://} LDAP_ADMIN_PASSWORD=$LDAP_ADMIN_PASSWORD LDAP_READONLY_USER_PASSWORD=$LDAP_BIND_PW LDAP_BIND_DN=$LDAP_BIND_DN