From 756f203006bc0e47d67645516316e567b534f359 Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Thu, 18 Jul 2019 09:50:17 -0700 Subject: [PATCH] Enable ldap support --- env.template | 16 ++++++++-------- start.sh | 12 ++++++++++++ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/env.template b/env.template index 47bada8..c6a00bd 100644 --- a/env.template +++ b/env.template @@ -22,14 +22,14 @@ SMTP_PASSWORD= SMTP_AUTH_METHOD=plain SMTP_OPENSSL_VERIFY_MODE=none -# LDAP_ENABLED=$([ -z "${CLOUDRON_LDAP_SERVER}" ] && echo "false" || echo "true") -# LDAP_HOST=${CLOUDRON_LDAP_SERVER} -# LDAP_PORT=${CLOUDRON_LDAP_PORT} -# LDAP_BASE=${CLOUDRON_LDAP_USERS_BASE_DN} -# LDAP_BIND_DN=${CLOUDRON_LDAP_BIND_DN} -# LDAP_PASSWORD=${CLOUDRON_LDAP_BIND_PASSWORD} -# LDAP_UID=username -# LDAP_SEARCH_FILTER=(|(%{uid}=%{email})(mail=%{email})) +LDAP_ENABLED= +LDAP_HOST= +LDAP_PORT= +LDAP_BASE= +LDAP_BIND_DN= +LDAP_PASSWORD= +LDAP_UID=username +LDAP_SEARCH_FILTER=(|(%{uid}=%{email})(mail=%{email})) SECRET_KEY_BASE= OTP_SECRET= diff --git a/start.sh b/start.sh index d8e46ff..9f78f63 100755 --- a/start.sh +++ b/start.sh @@ -26,6 +26,18 @@ sed -e "s/DB_HOST=.*/DB_HOST=${CLOUDRON_POSTGRESQL_HOST}/g" \ -e "s/LOCAL_DOMAIN=.*/LOCAL_DOMAIN=${CLOUDRON_APP_DOMAIN}/g" \ -i /app/data/env.production +if [[ -n "${CLOUDRON_LDAP_SERVER:-}" ]]; then + sed -e "s/LDAP_ENABLED=.*/LDAP_ENABLED=true/g" \ + -e "s/LDAP_HOST=.*/LDAP_HOST=${CLOUDRON_LDAP_SERVER}/g" \ + -e "s/LDAP_PORT=.*/LDAP_PORT=${CLOUDRON_LDAP_PORT}/g" \ + -e "s/LDAP_BASE=.*/LDAP_HOST=${CLOUDRON_LDAP_USERS_BASE_DN}/g" \ + -e "s/LDAP_BIND_DN=.*/LDAP_BIND_DN=${CLOUDRON_LDAP_BIND_DN}/g" \ + -e "s/LDAP_BIND_PASSWORD=.*/LDAP_BIND_DN=${CLOUDRON_LDAP_BIND_PASSWORD}/g" + -i /app/data/env.production +else + sed -e "s/LDAP_ENABLED=.*/LDAP_ENABLED=false/g" -i /app/data/env.production +fi + if grep -q "^SECRET_KEY_BASE=$" /app/data/env.production; then echo "==> Generating secrets" export RANDFILE=/tmp/.rnd