public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'development-upstream' into Override-config

Browse source 
# Conflicts:
#	docker-entrypoint.sh
This commit is contained in:
Gerhard Sletten 2020-01-06 10:50:42 +01:00
commit 94d3f4d725
11 changed files with 188 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docker-entrypoint.sh
View file

@ -22,6 +22,7 @@ MYSQL_HOST=${MYSQL_HOST:-'mysql'}
MYSQL_DATABASE=${MYSQL_DATABASE:-'mailtrain'}
MYSQL_USER=${MYSQL_USER:-'mailtrain'}
MYSQL_PASSWORD=${MYSQL_PASSWORD:-'mailtrain'}
POOL_NAME=${POOL_NAME:-$(hostname)}
# Warning for users that already rely on the MAILTRAIN_SETTING variable
# Can probably be removed in the future.
@ -61,6 +62,7 @@ builtinZoneMTA:
level: warn
mongo: mongodb://${MONGO_HOST}:27017/zone-mta
redis: redis://${REDIS_HOST}:6379/2
poolName: $POOL_NAME
queue:
processes: 5