chore: Migrate `SASLAUTHD_*` vars into `start-mailserver.sh` (#2562)
This commit is contained in:
Casper
GitHub
parent
4e3e16189c
commit
9a739113f4
|
|
@ -116,6 +116,51 @@ VARS[TZ]="${TZ:=}"
|
||||||
VARS[UPDATE_CHECK_INTERVAL]="${UPDATE_CHECK_INTERVAL:=1d}"
|
VARS[UPDATE_CHECK_INTERVAL]="${UPDATE_CHECK_INTERVAL:=1d}"
|
||||||
VARS[VIRUSMAILS_DELETE_DELAY]="${VIRUSMAILS_DELETE_DELAY:=7}"
|
VARS[VIRUSMAILS_DELETE_DELAY]="${VIRUSMAILS_DELETE_DELAY:=7}"
|
||||||
|
|
||||||
|
# SASL specific variables
|
||||||
|
VARS[SASLAUTHD_MECHANISMS]="${SASLAUTHD_MECHANISMS:=pam}"
|
||||||
|
VARS[SASLAUTHD_LDAP_SERVER]="${SASLAUTHD_LDAP_SERVER:=${LDAP_SERVER_HOST}}"
|
||||||
|
VARS[SASLAUTHD_LDAP_FILTER]="${SASLAUTHD_LDAP_FILTER:=(&(uniqueIdentifier=%u)(mailEnabled=TRUE))}"
|
||||||
|
VARS[SASLAUTHD_LDAP_BIND_DN]="${SASLAUTHD_LDAP_BIND_DN:=${LDAP_BIND_DN}}"
|
||||||
|
VARS[SASLAUTHD_LDAP_PASSWORD]="${SASLAUTHD_LDAP_PASSWORD:=${LDAP_BIND_PW}}"
|
||||||
|
VARS[SASLAUTHD_LDAP_SEARCH_BASE]="${SASLAUTHD_LDAP_SEARCH_BASE:=${LDAP_SEARCH_BASE}}"
|
||||||
|
[[ ${SASLAUTHD_LDAP_SERVER} != *'://'* ]] && SASLAUTHD_LDAP_SERVER="ldap://${SASLAUTHD_LDAP_SERVER}"
|
||||||
|
VARS[SASLAUTHD_LDAP_SERVER]="${SASLAUTHD_LDAP_SERVER}"
|
||||||
|
VARS[SASLAUTHD_LDAP_START_TLS]="${SASLAUTHD_LDAP_START_TLS:=no}"
|
||||||
|
VARS[SASLAUTHD_LDAP_TLS_CHECK_PEER]="${SASLAUTHD_LDAP_TLS_CHECK_PEER:=no}"
|
||||||
|
VARS[SASLAUTHD_LDAP_AUTH_METHOD]="${SASLAUTHD_LDAP_AUTH_METHOD:=bind}"
|
||||||
|
|
||||||
|
if [[ -z ${SASLAUTHD_LDAP_TLS_CACERT_FILE} ]]
|
||||||
|
then
|
||||||
|
SASLAUTHD_LDAP_TLS_CACERT_FILE=''
|
||||||
|
else
|
||||||
|
SASLAUTHD_LDAP_TLS_CACERT_FILE="ldap_tls_cacert_file: ${SASLAUTHD_LDAP_TLS_CACERT_FILE}"
|
||||||
|
fi
|
||||||
|
VARS[SASLAUTHD_LDAP_TLS_CACERT_FILE]="${SASLAUTHD_LDAP_TLS_CACERT_FILE}"
|
||||||
|
|
||||||
|
if [[ -z ${SASLAUTHD_LDAP_TLS_CACERT_DIR} ]]
|
||||||
|
then
|
||||||
|
SASLAUTHD_LDAP_TLS_CACERT_DIR=''
|
||||||
|
else
|
||||||
|
SASLAUTHD_LDAP_TLS_CACERT_DIR="ldap_tls_cacert_dir: ${SASLAUTHD_LDAP_TLS_CACERT_DIR}"
|
||||||
|
fi
|
||||||
|
VARS[SASLAUTHD_LDAP_TLS_CACERT_DIR]="${SASLAUTHD_LDAP_TLS_CACERT_DIR}"
|
||||||
|
|
||||||
|
if [[ -z ${SASLAUTHD_LDAP_PASSWORD_ATTR} ]]
|
||||||
|
then
|
||||||
|
SASLAUTHD_LDAP_PASSWORD_ATTR=''
|
||||||
|
else
|
||||||
|
SASLAUTHD_LDAP_PASSWORD_ATTR="ldap_password_attr: ${SASLAUTHD_LDAP_PASSWORD_ATTR}"
|
||||||
|
fi
|
||||||
|
VARS[SASLAUTHD_LDAP_PASSWORD_ATTR]="${SASLAUTHD_LDAP_PASSWORD_ATTR}"
|
||||||
|
|
||||||
|
if [[ -z ${SASLAUTHD_LDAP_MECH} ]]
|
||||||
|
then
|
||||||
|
SASLAUTHD_LDAP_MECH=''
|
||||||
|
else
|
||||||
|
SASLAUTHD_LDAP_MECH="ldap_mech: ${SASLAUTHD_LDAP_MECH}"
|
||||||
|
fi
|
||||||
|
VARS[SASLAUTHD_LDAP_MECH]="${SASLAUTHD_LDAP_MECH}"
|
||||||
|
|
||||||
# ------------------------------------------------------------
|
# ------------------------------------------------------------
|
||||||
# ? << Setup of default and global values / variables
|
# ? << Setup of default and global values / variables
|
||||||
# --
|
# --
|
||||||
|
|
|
||||||
|
|
@ -538,52 +538,6 @@ function _setup_saslauthd
|
||||||
{
|
{
|
||||||
_log 'debug' 'Setting up SASLAUTHD'
|
_log 'debug' 'Setting up SASLAUTHD'
|
||||||
|
|
||||||
# checking env vars and setting defaults
|
|
||||||
[[ -z ${SASLAUTHD_MECHANISMS:-} ]] && SASLAUTHD_MECHANISMS=pam
|
|
||||||
[[ -z ${SASLAUTHD_LDAP_SERVER} ]] && SASLAUTHD_LDAP_SERVER="${LDAP_SERVER_HOST}"
|
|
||||||
[[ -z ${SASLAUTHD_LDAP_FILTER} ]] && SASLAUTHD_LDAP_FILTER='(&(uniqueIdentifier=%u)(mailEnabled=TRUE))'
|
|
||||||
|
|
||||||
[[ -z ${SASLAUTHD_LDAP_BIND_DN} ]] && SASLAUTHD_LDAP_BIND_DN="${LDAP_BIND_DN}"
|
|
||||||
[[ -z ${SASLAUTHD_LDAP_PASSWORD} ]] && SASLAUTHD_LDAP_PASSWORD="${LDAP_BIND_PW}"
|
|
||||||
[[ -z ${SASLAUTHD_LDAP_SEARCH_BASE} ]] && SASLAUTHD_LDAP_SEARCH_BASE="${LDAP_SEARCH_BASE}"
|
|
||||||
|
|
||||||
if [[ ${SASLAUTHD_LDAP_SERVER} != *'://'* ]]
|
|
||||||
then
|
|
||||||
SASLAUTHD_LDAP_SERVER="ldap://${SASLAUTHD_LDAP_SERVER}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
[[ -z ${SASLAUTHD_LDAP_START_TLS} ]] && SASLAUTHD_LDAP_START_TLS=no
|
|
||||||
[[ -z ${SASLAUTHD_LDAP_TLS_CHECK_PEER} ]] && SASLAUTHD_LDAP_TLS_CHECK_PEER=no
|
|
||||||
[[ -z ${SASLAUTHD_LDAP_AUTH_METHOD} ]] && SASLAUTHD_LDAP_AUTH_METHOD=bind
|
|
||||||
|
|
||||||
if [[ -z ${SASLAUTHD_LDAP_TLS_CACERT_FILE} ]]
|
|
||||||
then
|
|
||||||
SASLAUTHD_LDAP_TLS_CACERT_FILE=''
|
|
||||||
else
|
|
||||||
SASLAUTHD_LDAP_TLS_CACERT_FILE="ldap_tls_cacert_file: ${SASLAUTHD_LDAP_TLS_CACERT_FILE}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ -z ${SASLAUTHD_LDAP_TLS_CACERT_DIR} ]]
|
|
||||||
then
|
|
||||||
SASLAUTHD_LDAP_TLS_CACERT_DIR=''
|
|
||||||
else
|
|
||||||
SASLAUTHD_LDAP_TLS_CACERT_DIR="ldap_tls_cacert_dir: ${SASLAUTHD_LDAP_TLS_CACERT_DIR}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ -z ${SASLAUTHD_LDAP_PASSWORD_ATTR} ]]
|
|
||||||
then
|
|
||||||
SASLAUTHD_LDAP_PASSWORD_ATTR=''
|
|
||||||
else
|
|
||||||
SASLAUTHD_LDAP_PASSWORD_ATTR="ldap_password_attr: ${SASLAUTHD_LDAP_PASSWORD_ATTR}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ -z ${SASLAUTHD_LDAP_MECH} ]]
|
|
||||||
then
|
|
||||||
SASLAUTHD_LDAP_MECH=''
|
|
||||||
else
|
|
||||||
SASLAUTHD_LDAP_MECH="ldap_mech: ${SASLAUTHD_LDAP_MECH}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ ! -f /etc/saslauthd.conf ]]
|
if [[ ! -f /etc/saslauthd.conf ]]
|
||||||
then
|
then
|
||||||
_log 'trace' 'Creating /etc/saslauthd.conf'
|
_log 'trace' 'Creating /etc/saslauthd.conf'
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue