From 0e7a5dae82f4af22c486bbe196ad31303b170f3c Mon Sep 17 00:00:00 2001 From: Kevin Jilissen Date: Tue, 31 Dec 2019 01:28:08 +0100 Subject: [PATCH] Add possibility to set pool name for builtin ZoneMTA. --- docker-entrypoint.sh | 2 ++ server/lib/builtin-zone-mta.js | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index d8a9fadf..49fa2134 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -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. @@ -64,6 +65,7 @@ else level: warn mongo: mongodb://${MONGO_HOST}:27017/zone-mta redis: redis://${REDIS_HOST}:6379/2 + poolName: $POOL_NAME queue: processes: 5 diff --git a/server/lib/builtin-zone-mta.js b/server/lib/builtin-zone-mta.js index e25da829..ded3b5c6 100644 --- a/server/lib/builtin-zone-mta.js +++ b/server/lib/builtin-zone-mta.js @@ -119,6 +119,13 @@ async function createConfig() { } }, + pools: { + default: { + address: '0.0.0.0', + name: config.builtinZoneMTA.poolName || os.hostname() + } + }, + zones: { default: { preferIPv6: false,