From ffecc92e6ae52469d9d55876d6ae07d06fc7d99e Mon Sep 17 00:00:00 2001 From: kbeaugrand Date: Thu, 29 Dec 2016 14:00:39 +0100 Subject: [PATCH 1/4] Fix /var/mail right at container initialization rather than startup --- Dockerfile | 3 +++ target/start-mailserver.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b9fa1c1b..a752c05f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -120,7 +120,10 @@ RUN sed -i -r "/^#?compress/c\compress\ncopytruncate" /etc/logrotate.conf && \ # Get LetsEncrypt signed certificate RUN curl -s https://letsencrypt.org/certs/lets-encrypt-x3-cross-signed.pem > /etc/ssl/certs/lets-encrypt-x3-cross-signed.pem +RUN chown 5000:5000 /var/mail + COPY ./target/bin /usr/local/bin + # Start-mailserver script COPY ./target/start-mailserver.sh /usr/local/bin/ RUN chmod +x /usr/local/bin/* diff --git a/target/start-mailserver.sh b/target/start-mailserver.sh index c7fc4b7b..b87bd2a9 100644 --- a/target/start-mailserver.sh +++ b/target/start-mailserver.sh @@ -95,7 +95,7 @@ function register_functions() { ################### >> fix funcs - _register_fix_function "_fix_var_mail_permissions" +# _register_fix_function "_fix_var_mail_permissions" ################### << fix funcs From 6df52796bbb46b37d0e2947730943d1dc4208bef Mon Sep 17 00:00:00 2001 From: kbeaugrand Date: Fri, 30 Dec 2016 17:12:18 +0100 Subject: [PATCH 2/4] Add environnement variable to change postfix destinations --- target/start-mailserver.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/target/start-mailserver.sh b/target/start-mailserver.sh index b87bd2a9..4655c9aa 100644 --- a/target/start-mailserver.sh +++ b/target/start-mailserver.sh @@ -16,6 +16,7 @@ DEFAULT_VARS["ENABLE_FETCHMAIL"]="${ENABLE_FETCHMAIL:="0"}" DEFAULT_VARS["ENABLE_LDAP"]="${ENABLE_LDAP:="0"}" DEFAULT_VARS["ENABLE_SASLAUTHD"]="${ENABLE_SASLAUTHD:="0"}" DEFAULT_VARS["SMTP_ONLY"]="${SMTP_ONLY:="0"}" +DEFAULT_VARS["POSTFIX_MYDESTINATION"]="${POSTFIX_MYDESTINATION:=""}" DEFAULT_VARS["VIRUSMAILS_DELETE_DELAY"]="${VIRUSMAILS_DELETE_DELAY:="7"}" DEFAULT_VARS["DMS_DEBUG"]="${DMS_DEBUG:="0"}" ########################################################################## @@ -86,6 +87,7 @@ function register_functions() { _register_setup_function "_setup_security_stack" _register_setup_function "_setup_postfix_aliases" _register_setup_function "_setup_postfix_vhost" + _register_setup_function "_setup_postfix_mydestination" if [ ! -z "$AWS_SES_HOST" -a ! -z "$AWS_SES_USERPASS" ]; then _register_setup_function "_setup_postfix_relay_amazon_ses" @@ -534,6 +536,12 @@ function _setup_postfix_aliases() { fi } +function _setup_postfix_mydestination(){ + notify 'task' 'Setting up Postfix My Destination' + + postconf -e "mydestination=$POSTFIX_MYDESTINATION" +} + function _setup_dkim() { notify 'task' 'Setting up DKIM' From 765f26a62024af31e6ebd2c60471377c35f27f91 Mon Sep 17 00:00:00 2001 From: kbeaugrand Date: Sat, 31 Dec 2016 19:25:47 +0100 Subject: [PATCH 3/4] Add vhost when using specific destinations --- target/start-mailserver.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/target/start-mailserver.sh b/target/start-mailserver.sh index 4655c9aa..6fca1969 100644 --- a/target/start-mailserver.sh +++ b/target/start-mailserver.sh @@ -540,6 +540,14 @@ function _setup_postfix_mydestination(){ notify 'task' 'Setting up Postfix My Destination' postconf -e "mydestination=$POSTFIX_MYDESTINATION" + + notify 'task' "Setting up Postfix vhost" + + IFS=', ' eval 'vhosts=($POSTFIX_MYDESTINATION)' + for i in "${vhosts[@]}" + do + echo $i >> /etc/postfix/vhost + done } function _setup_dkim() { From 2ee15988c2eee124ca9fee086392b753ac4d1782 Mon Sep 17 00:00:00 2001 From: kbeaugrand Date: Sun, 1 Jan 2017 12:41:21 +0100 Subject: [PATCH 4/4] POSTFIX_MAILBOXDOMAINS --- target/start-mailserver.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/target/start-mailserver.sh b/target/start-mailserver.sh index 6fca1969..24d07631 100644 --- a/target/start-mailserver.sh +++ b/target/start-mailserver.sh @@ -16,7 +16,7 @@ DEFAULT_VARS["ENABLE_FETCHMAIL"]="${ENABLE_FETCHMAIL:="0"}" DEFAULT_VARS["ENABLE_LDAP"]="${ENABLE_LDAP:="0"}" DEFAULT_VARS["ENABLE_SASLAUTHD"]="${ENABLE_SASLAUTHD:="0"}" DEFAULT_VARS["SMTP_ONLY"]="${SMTP_ONLY:="0"}" -DEFAULT_VARS["POSTFIX_MYDESTINATION"]="${POSTFIX_MYDESTINATION:=""}" +DEFAULT_VARS["POSTFIX_MAILBOXDOMAINS"]="${POSTFIX_MAILBOXDOMAINS:="localhost"}" DEFAULT_VARS["VIRUSMAILS_DELETE_DELAY"]="${VIRUSMAILS_DELETE_DELAY:="7"}" DEFAULT_VARS["DMS_DEBUG"]="${DMS_DEBUG:="0"}" ########################################################################## @@ -537,13 +537,9 @@ function _setup_postfix_aliases() { } function _setup_postfix_mydestination(){ - notify 'task' 'Setting up Postfix My Destination' - - postconf -e "mydestination=$POSTFIX_MYDESTINATION" - notify 'task' "Setting up Postfix vhost" - IFS=', ' eval 'vhosts=($POSTFIX_MYDESTINATION)' + IFS=', ' eval 'vhosts=($POSTFIX_MAILBOXDOMAINS)' for i in "${vhosts[@]}" do echo $i >> /etc/postfix/vhost