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

Add possibility to set pool name for builtin ZoneMTA.

Browse source
This commit is contained in:
Kevin Jilissen 2019-12-31 01:28:08 +01:00
parent 7744f5dc29
commit 0e7a5dae82
2 changed files with 9 additions and 0 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_DATABASE=${MYSQL_DATABASE:-'mailtrain'}
MYSQL_USER=${MYSQL_USER:-'mailtrain'} MYSQL_USER=${MYSQL_USER:-'mailtrain'}
MYSQL_PASSWORD=${MYSQL_PASSWORD:-'mailtrain'} MYSQL_PASSWORD=${MYSQL_PASSWORD:-'mailtrain'}
POOL_NAME=${POOL_NAME:-$(hostname)}
# Warning for users that already rely on the MAILTRAIN_SETTING variable # Warning for users that already rely on the MAILTRAIN_SETTING variable
# Can probably be removed in the future. # Can probably be removed in the future.
@ -64,6 +65,7 @@ else
level: warn level: warn
mongo: mongodb://${MONGO_HOST}:27017/zone-mta mongo: mongodb://${MONGO_HOST}:27017/zone-mta
redis: redis://${REDIS_HOST}:6379/2 redis: redis://${REDIS_HOST}:6379/2
poolName: $POOL_NAME
queue: queue:
processes: 5 processes: 5

7
server/lib/builtin-zone-mta.js
View file

@ -119,6 +119,13 @@ async function createConfig() {
} }
}, },
pools: {
default: {
address: '0.0.0.0',
name: config.builtinZoneMTA.poolName || os.hostname()
}
},
zones: { zones: {
default: { default: {
preferIPv6: false, preferIPv6: false,