Merge branch 'master' into dev

data/Dockerfiles/postfix/Dockerfile

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

generate_config.sh

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