From d8404a3767091a1c4e537ee71f5313944e650aa6 Mon Sep 17 00:00:00 2001 From: Arno Fortelny Date: Thu, 7 Apr 2016 15:04:49 -0400 Subject: [PATCH 1/2] Updated $SASL_PASSWD => $SASL_PASSWORD The README lists the environmental variable as `SASL_PASSWORD` while the startup script was actually looking for `SASL_PASSWD`. The script now looks for `SASL_PASSWORD` which is consistent with documentation. Also changed warning to info, as per discussion in #120 --- start-mailserver.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/start-mailserver.sh b/start-mailserver.sh index 010e09b8..6ff7da7d 100644 --- a/start-mailserver.sh +++ b/start-mailserver.sh @@ -209,15 +209,15 @@ else echo "'/tmp/postfix/main.cf' not provided. No extra postfix settings loaded." fi -if [ ! -z "$SASL_PASSWD" ]; then - echo "$SASL_PASSWD" > /etc/postfix/sasl_passwd +if [ ! -z "$SASL_PASSWORD" ]; then + echo "$SASL_PASSWORD" > /etc/postfix/sasl_passwd postmap hash:/etc/postfix/sasl_passwd rm /etc/postfix/sasl_passwd chown root:root /etc/postfix/sasl_passwd.db chmod 0600 /etc/postfix/sasl_passwd.db echo "Loaded SASL_PASSWORD" else - echo "==> Warning: 'SASL_PASSWORD' is not provided. /etc/postfix/sasl_passwd not created." + echo "Info: SASL_PASSWORD is not provided. /etc/postfix/sasl_passwd not created." fi echo "Fixing permissions" From 44fd4b26f6d31f09b4981035b5d8be883b1805a8 Mon Sep 17 00:00:00 2001 From: Arno Fortelny Date: Thu, 7 Apr 2016 15:05:36 -0400 Subject: [PATCH 2/2] Update Makefile Updated `SASL_PASSWD` to `SASL_PASSWORD` to be consistent with documentation. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 03899b5c..e517b411 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ run: -e SA_TAG=1.0 \ -e SA_TAG2=2.0 \ -e SA_KILL=3.0 \ - -e SASL_PASSWD=testing \ + -e SASL_PASSWORD=testing \ -h mail.my-domain.com -t $(NAME) docker run -d --name mail_pop3 \ -v "`pwd`/postfix":/tmp/postfix \