From 5b896695b356dd02f5091ac4e544d553baaaaf90 Mon Sep 17 00:00:00 2001 From: Kevin Crawley Date: Thu, 19 Jan 2017 12:58:05 -0600 Subject: [PATCH] modified parameter expansion --- target/start-mailserver.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/start-mailserver.sh b/target/start-mailserver.sh index 2103b589..448c7725 100644 --- a/target/start-mailserver.sh +++ b/target/start-mailserver.sh @@ -18,7 +18,7 @@ DEFAULT_VARS["ENABLE_SASLAUTHD"]="${ENABLE_SASLAUTHD:="0"}" DEFAULT_VARS["SMTP_ONLY"]="${SMTP_ONLY:="0"}" DEFAULT_VARS["VIRUSMAILS_DELETE_DELAY"]="${VIRUSMAILS_DELETE_DELAY:="7"}" DEFAULT_VARS["DMS_DEBUG"]="${DMS_DEBUG:="0"}" -DEFAULT_VARS["OVERRIDE_HOSTNAME"]="${OVERRIDE_HOSTNAME:="false"}" +DEFAULT_VARS["OVERRIDE_HOSTNAME"]="${OVERRIDE_HOSTNAME}" ########################################################################## # << DEFAULT VARS ########################################################################## @@ -319,7 +319,7 @@ function check() { function _check_hostname() { notify "task" "Check that hostname/domainname is provided or overidden (no default docker hostname/kubernetes) [$FUNCNAME]" - if [[ ${DEFAULT_VARS["OVERRIDE_HOSTNAME"]} != "false" ]]; then + if [[ ! -z ${DEFAULT_VARS["OVERRIDE_HOSTNAME"]} ]]; then export HOSTNAME=${DEFAULT_VARS["OVERRIDE_HOSTNAME"]} export DOMAINNAME=$(echo $HOSTNAME | sed s/[^.]*.//) fi