Archive-Team
/
docker-mailserver
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #122 from aforty/master 

Fixed var name $SASL_PASSWD to $SASL_PASSWORD
This commit is contained in:
Thomas VIAL 2016-04-11 14:00:36 +02:00
parent ae5052f210 8bc209aeb9
commit 996af0e15f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -19,7 +19,7 @@ run:
-e SA_TAG=1.0 \ -e SA_TAG=1.0 \
-e SA_TAG2=2.0 \ -e SA_TAG2=2.0 \
-e SA_KILL=3.0 \ -e SA_KILL=3.0 \
-e SASL_PASSWD=testing \ -e SASL_PASSWORD=testing \
-h mail.my-domain.com -t $(NAME) -h mail.my-domain.com -t $(NAME)
sleep 15 sleep 15
docker run -d --name mail_pop3 \ docker run -d --name mail_pop3 \

6
start-mailserver.sh
View File

@ -211,15 +211,15 @@ else
echo "'/tmp/postfix/main.cf' not provided. No extra postfix settings loaded." echo "'/tmp/postfix/main.cf' not provided. No extra postfix settings loaded."
fi fi
if [ ! -z "$SASL_PASSWD" ]; then if [ ! -z "$SASL_PASSWORD" ]; then
echo "$SASL_PASSWD" > /etc/postfix/sasl_passwd echo "$SASL_PASSWORD" > /etc/postfix/sasl_passwd
postmap hash:/etc/postfix/sasl_passwd postmap hash:/etc/postfix/sasl_passwd
rm /etc/postfix/sasl_passwd rm /etc/postfix/sasl_passwd
chown root:root /etc/postfix/sasl_passwd.db chown root:root /etc/postfix/sasl_passwd.db
chmod 0600 /etc/postfix/sasl_passwd.db chmod 0600 /etc/postfix/sasl_passwd.db
echo "Loaded SASL_PASSWORD" echo "Loaded SASL_PASSWORD"
else 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 fi
echo "Fixing permissions" echo "Fixing permissions"