From c480a9787d68dfc0155a526681f1941784f8e8d3 Mon Sep 17 00:00:00 2001 From: Guillaume Hain Date: Fri, 13 Jul 2018 06:48:38 +0200 Subject: [PATCH] Updates generate_config.sh making it working on macOS --- generate_config.sh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/generate_config.sh b/generate_config.sh index e0d77653..e453a221 100755 --- a/generate_config.sh +++ b/generate_config.sh @@ -24,7 +24,8 @@ if [[ -f mailcow.conf ]]; then fi while [ -z "${MAILCOW_HOSTNAME}" ]; do - read -p "Hostname (FQDN): " -ei "mx.example.org" MAILCOW_HOSTNAME + read -p "Hostname (FQDN): " -e MAILCOW_HOSTNAME + [ -z "${MAILCOW_HOSTNAME}" ] && MAILCOW_HOSTNAME='mx.example.org' DOTS=${MAILCOW_HOSTNAME//[^.]}; if [ ${#DOTS} -lt 2 ]; then echo "${MAILCOW_HOSTNAME} is not a FQDN" @@ -39,9 +40,11 @@ elif [[ -a /etc/localtime ]]; then fi if [ -z "$TZ" ]; then - read -p "Timezone: " -ei "Europe/Berlin" TZ + read -p "Timezone: " -e MAILCOW_TZ + [ -z "${MAILCOW_TZ}" ] && MAILCOW_TZ='Europe/Berlin' else - read -p "Timezone: " -ei ${TZ} TZ + read -p "Timezone: " -e MAILCOW_TZ + [ -z "${MAILCOW_TZ}" ] && MAILCOW_TZ=${TZ} fi [[ ! -f ./data/conf/rspamd/override.d/worker-controller-password.inc ]] && echo '# Placeholder' > ./data/conf/rspamd/override.d/worker-controller-password.inc @@ -62,8 +65,8 @@ DBNAME=mailcow DBUSER=mailcow # Please use long, random alphanumeric strings (A-Za-z0-9) -DBPASS=$(