diff --git a/docker-compose.yml b/docker-compose.yml index 4e724c0..7e050bd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -224,6 +224,7 @@ services: - "465:465" - "587:587" - "993:993" + - "11334:11334" labels: - "com.centurylinklabs.watchtower.enable=true" depends_on: @@ -240,15 +241,6 @@ services: - /srv/docker/container/mail/mara-bin:/root/bin - /srv/docker/container/mail/monitoring-results:/monitoring-results environment: -##################################### del block ############################ - - ENABLE_SPAMASSASSIN=1 - - ENABLE_SPAMASSASSIN_KAM=1 - - SPAMASSASIN_SPAM_TO_INBOX=1 - - MOVE_SPAM_TO_JUNK=1 - - SA_SPAM_SUBJECT=1 - - AMAVIS_LOGLEVEL=-1 - # enable rspam and delete this del block -##################################### del block ############################ - ENABLE_CLAMAV=1 - ENABLE_FAIL2BAN=1 - ENABLE_POSTGREY=0 @@ -258,22 +250,20 @@ services: - ENABLE_MANAGESIEVE=0 # don't know if this can go to 1 or not, seems more for postscreen than rspamd, so not sure if it has always been off? - ENABLE_DNSBL=0 -# enable rspamd be uncommenting block ############################ -# # as per doco, enabling rspamd and disabling unneeded services (up to spamassassin) -# - ENABLE_RSPAMD=1 -# - ENABLE_OPENDKIM=0 -# - ENABLE_OPENDMARC=0 -# - ENABLE_POLICYD_SPF=0 -# - ENABLE_AMAVIS=0 -# - ENABLE_SPAMASSASSIN=0 -# - MOVE_SPAM_TO_JUNK=1 -# # only greylist spammy emails -# - RSPAMD_GREYLISTING=1 -# # if ppl move mail to junk -> inbox (spam) or reverse (ham), learn from it -# - RSPAMD_LEARN=1 -# # some hostname heuristics for dodgy mailservers using wrong syntax - adds header only at the moment, test and drop when we trust -# - RSPAMD_HFILTER=1 -##################################### rspam block ############################ + # as per doco, enabling rspamd and disabling unneeded services (up to spamassassin) + - ENABLE_RSPAMD=1 + - ENABLE_OPENDKIM=0 + - ENABLE_OPENDMARC=0 + - ENABLE_POLICYD_SPF=0 + - ENABLE_AMAVIS=0 + - ENABLE_SPAMASSASSIN=0 + - MOVE_SPAM_TO_JUNK=1 + # only greylist spammy emails + - RSPAMD_GREYLISTING=1 + # if ppl move mail to junk -> inbox (spam) or reverse (ham), learn from it + - RSPAMD_LEARN=1 + # some hostname heuristics for dodgy mailservers using wrong syntax - adds header only at the moment, test and drop when we trust + - RSPAMD_HFILTER=1 # spoof prot stops anyone sending with an email address that doesn't match what they connected with - SPOOF_PROTECTION=1 - ONE_DIR=1 @@ -302,7 +292,6 @@ services: - /srv/docker/config/secrets/ldap-mail-common cap_add: - NET_ADMIN - - SYS_PTRACE openldap: image: bitnami/openldap