From 6336c0b256682527b880032301da4d3ba555e030 Mon Sep 17 00:00:00 2001 From: Casper Date: Tue, 31 Aug 2021 13:50:56 +0200 Subject: [PATCH] Change default value of ONE_DIR (#2148) * ONE_DIR=1 * Update Dockerfile * Update start-mailserver.sh * Update tests.bats * Update tests.bats Co-authored-by: Georg Lauterbach <44545919+georglauterbach@users.noreply.github.com> --- Dockerfile | 2 +- mailserver.env | 2 +- target/scripts/start-mailserver.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 12f1a0bd..e4e16413 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ LABEL org.opencontainers.image.source="https://github.com/docker-mailserver/dock ENV ENABLE_POSTGREY=0 ENV FETCHMAIL_POLL=300 -ENV ONE_DIR=0 +ENV ONE_DIR=1 ENV POSTGREY_AUTO_WHITELIST_CLIENTS=5 ENV POSTGREY_DELAY=300 ENV POSTGREY_MAX_AGE=35 diff --git a/mailserver.env b/mailserver.env index 2e9fd635..fca74c8a 100644 --- a/mailserver.env +++ b/mailserver.env @@ -26,7 +26,7 @@ SUPERVISOR_LOGLEVEL= # 0 => mail state in default directories # 1 => consolidate all states into a single directory (`/var/mail-state`) to allow persistence using docker volumes -ONE_DIR=0 +ONE_DIR=1 # empty => postmaster@domain.com # => Specify the postmaster address diff --git a/target/scripts/start-mailserver.sh b/target/scripts/start-mailserver.sh index 0a4c3903..5fc9b1e9 100755 --- a/target/scripts/start-mailserver.sh +++ b/target/scripts/start-mailserver.sh @@ -42,7 +42,7 @@ VARS[LOGROTATE_INTERVAL]="${LOGROTATE_INTERVAL:=${REPORT_INTERVAL:-daily}}" VARS[LOGWATCH_INTERVAL]="${LOGWATCH_INTERVAL:=none}" VARS[MOVE_SPAM_TO_JUNK]="${MOVE_SPAM_TO_JUNK:=1}" VARS[NETWORK_INTERFACE]="${NETWORK_INTERFACE:=eth0}" -VARS[ONE_DIR]="${ONE_DIR:=0}" +VARS[ONE_DIR]="${ONE_DIR:=1}" VARS[OVERRIDE_HOSTNAME]="${OVERRIDE_HOSTNAME}" VARS[POSTGREY_AUTO_WHITELIST_CLIENTS]="${POSTGREY_AUTO_WHITELIST_CLIENTS:=5}" VARS[POSTGREY_DELAY]="${POSTGREY_DELAY:=300}"