Merge branch 'master' into dev

master
André Peters 2017-01-29 22:26:06 +01:00 committed by GitHub
commit 432246b3ca
2 changed files with 8 additions and 2 deletions

View File

@ -13,6 +13,7 @@ RUN apt-get update
RUN apt-get install -y --no-install-recommends supervisor \ RUN apt-get install -y --no-install-recommends supervisor \
postfix \ postfix \
sasl2-bin \ sasl2-bin \
libsasl2-modules \
postfix \ postfix \
postfix-mysql \ postfix-mysql \
postfix-pcre \ postfix-pcre \

View File

@ -12,8 +12,13 @@ if [[ -f mailcow.conf ]]; then
esac esac
fi fi
if [ -z "$MAILCOW_HOSTNAME" ]; then
read -p "Hostname (FQDN): " -ei "mx.example.org" MAILCOW_HOSTNAME read -p "Hostname (FQDN): " -ei "mx.example.org" MAILCOW_HOSTNAME
fi
if [ -z "$TZ" ]; then
read -p "Timezone: " -ei "Europe/Berlin" TZ read -p "Timezone: " -ei "Europe/Berlin" TZ
fi
cat << EOF > mailcow.conf cat << EOF > mailcow.conf
# ------------------------------ # ------------------------------