github-com-docker-mailserver/docker-mailserver
1
0
Fork 0
mirror of https://github.com/docker-mailserver/docker-mailserver.git synced 2024-01-19 02:48:50 +00:00
Code Issues Projects Releases Wiki Activity

This should fix most of 2.3 issues reported in #545 & #586 (#612)

Browse source 
* Fixes most of 2.3 issues reported in #545 & 586
This commit is contained in:
Thomas VIAL 2017-05-22 09:28:32 +02:00 committed by GitHub
parent c0530491c3
commit b2922935ff
3 changed files with 40 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
target/postfix/master.cf
View file

@ -7,7 +7,7 @@
# #
# ========================================================================== # ==========================================================================
# service type private unpriv chroot wakeup maxproc command + args # service type private unpriv chroot wakeup maxproc command + args
# (yes) (yes) (yes) (never) (100) # (yes) (yes) (no) (never) (100)
# ========================================================================== # ==========================================================================
smtp inet n - n - - smtpd smtp inet n - n - - smtpd
@ -22,32 +22,32 @@ submission inet n - n - - smtpd
-o smtpd_client_restrictions=permit_sasl_authenticated,reject -o smtpd_client_restrictions=permit_sasl_authenticated,reject
-o smtpd_relay_restrictions=permit_sasl_authenticated,reject -o smtpd_relay_restrictions=permit_sasl_authenticated,reject
-o milter_macro_daemon_name=ORIGINATING -o milter_macro_daemon_name=ORIGINATING
pickup fifo n - - 60 1 pickup pickup fifo n - y 60 1 pickup
-o content_filter= -o content_filter=
-o receive_override_options=no_header_body_checks -o receive_override_options=no_header_body_checks
cleanup unix n - - - 0 cleanup cleanup unix n - y - 0 cleanup
qmgr unix n - n 300 1 qmgr qmgr unix n - n 300 1 qmgr
tlsmgr unix - - - 1000? 1 tlsmgr tlsmgr unix - - y 1000? 1 tlsmgr
rewrite unix - - - - - trivial-rewrite rewrite unix - - y - - trivial-rewrite
bounce unix - - - - 0 bounce bounce unix - - y - 0 bounce
defer unix - - - - 0 bounce defer unix - - y - 0 bounce
trace unix - - - - 0 bounce trace unix - - y - 0 bounce
verify unix - - - - 1 verify verify unix - - y - 1 verify
flush unix n - - 1000? 0 flush flush unix n - y 1000? 0 flush
proxymap unix - - n - - proxymap proxymap unix - - n - - proxymap
proxywrite unix - - n - 1 proxymap proxywrite unix - - n - 1 proxymap
smtp unix - - - - - smtp smtp unix - - y - - smtp
relay unix - - - - - smtp relay unix - - y - - smtp
showq unix n - - - - showq showq unix n - y - - showq
error unix - - - - - error error unix - - y - - error
retry unix - - - - - error retry unix - - y - - error
discard unix - - - - - discard discard unix - - y - - discard
local unix - n n - - local local unix - n n - - local
virtual unix - n n - - virtual virtual unix - n n - - virtual
lmtp unix - - n - - lmtp lmtp unix - - n - - lmtp
anvil unix - - - - 1 anvil anvil unix - - y - 1 anvil
scache unix - - - - 1 scache scache unix - - y - 1 scache
maildrop unix - n n - - pipe maildrop unix - n n - - pipe
flags=DRhu user=vmail argv=/usr/bin/maildrop -d ${recipient} flags=DRhu user=vmail argv=/usr/bin/maildrop -d ${recipient}
@ -73,7 +73,7 @@ policyd-spf unix - n n - 0 spawn
# Amavis configuration # Amavis configuration
# #
smtp-amavis unix - - - - 2 smtp smtp-amavis unix - - n - 2 smtp
-o smtp_data_done_timeout=1200 -o smtp_data_done_timeout=1200
-o smtp_send_xforward_command=yes -o smtp_send_xforward_command=yes
-o disable_dns_lookups=yes -o disable_dns_lookups=yes

19
target/start-mailserver.sh
View file

@ -549,8 +549,16 @@ function _setup_dovecot_local_user() {
echo ${domain} >> /tmp/vhost.tmp echo ${domain} >> /tmp/vhost.tmp
done done
else else
notify 'warn' "'config/docker-mailserver/postfix-accounts.cf' is not provided. No mail account created." notify 'inf' "'config/docker-mailserver/postfix-accounts.cf' is not provided. No mail account created."
fi fi
if [[ ! $(grep '@' /tmp/docker-mailserver/postfix-accounts.cf | grep '|') ]]; then
if [ $ENABLE_LDAP -eq 0 ]; then
notify 'fatal' "Unless using LDAP, you need at least 1 email account to start the server."
defunc
fi
fi
} }
function _setup_ldap() { function _setup_ldap() {
@ -1096,10 +1104,17 @@ function _misc_save_states() {
ln -s $dest $d ln -s $dest $d
fi fi
done done
notify 'inf' 'Fixing /var/mail-state/* permissions'
chown -R clamav /var/mail-state/lib-clamav
chown -R postfix /var/mail-state/lib-postfix
chown -R postgrey /var/mail-state/lib-postgrey
chown -R debian-spamd /var/mail-state/lib-spamassasin
chown -R postfix /var/mail-state/spool-postfix
fi fi
} }
########################################################################## ##########################################################################
# >> Start Daemons # >> Start Daemons
########################################################################## ##########################################################################

4
test/tests.bats
View file

@ -744,6 +744,10 @@ load 'test_helper/bats-assert/load'
assert_failure assert_failure
run docker exec mail grep -i '(!)connect' /var/log/mail/mail.log run docker exec mail grep -i '(!)connect' /var/log/mail/mail.log
assert_failure assert_failure
run docker exec mail grep -i 'backwards-compatible default setting chroot=y' /var/log/mail/mail.log
assert_failure
run docker exec mail grep -i 'connect to 127.0.0.1:10023: Connection refused' /var/log/mail/mail.log
assert_failure
run docker exec mail_pop3 grep 'non-null host address bits in' /var/log/mail/mail.log run docker exec mail_pop3 grep 'non-null host address bits in' /var/log/mail/mail.log
assert_failure assert_failure
run docker exec mail_pop3 grep ': error:' /var/log/mail/mail.log run docker exec mail_pop3 grep ': error:' /var/log/mail/mail.log