Browse Source

Merge branch 'dev' of https://github.com/andryyy/mailcow-dockerized into dev

andryyy 8 years ago
parent
commit
2f2190f5d1
2 changed files with 8 additions and 2 deletions
  1. 1 0
      data/Dockerfiles/postfix/Dockerfile
  2. 7 2
      generate_config.sh

+ 1 - 0
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 \

+ 7 - 2
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
 # ------------------------------