ddp/docker-compose
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

converted over to rspamd including new dkim keys (into DNS and rspamd), and removed now unneeded PTRACE capability - dropped in Jun 2022)

Browse Source
This commit is contained in:
Damien De Paoli
2024-01-19 18:56:10 +11:00
parent d3587c6de4
commit da3a2de62f
1 changed files with 15 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
docker-compose.yml
View File

@@ -224,6 +224,7 @@ services:
- "465:465" - "465:465"
- "587:587" - "587:587"
- "993:993" - "993:993"
- "11334:11334"
labels: labels:
- "com.centurylinklabs.watchtower.enable=true" - "com.centurylinklabs.watchtower.enable=true"
depends_on: depends_on:
@@ -240,15 +241,6 @@ services:
- /srv/docker/container/mail/mara-bin:/root/bin - /srv/docker/container/mail/mara-bin:/root/bin
- /srv/docker/container/mail/monitoring-results:/monitoring-results - /srv/docker/container/mail/monitoring-results:/monitoring-results
environment: 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_CLAMAV=1
- ENABLE_FAIL2BAN=1 - ENABLE_FAIL2BAN=1
- ENABLE_POSTGREY=0 - ENABLE_POSTGREY=0
@@ -258,22 +250,20 @@ services:
- ENABLE_MANAGESIEVE=0 - 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? # 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_DNSBL=0
# enable rspamd be uncommenting block ############################ # as per doco, enabling rspamd and disabling unneeded services (up to spamassassin)
# # as per doco, enabling rspamd and disabling unneeded services (up to spamassassin) - ENABLE_RSPAMD=1
# - ENABLE_RSPAMD=1 - ENABLE_OPENDKIM=0
# - ENABLE_OPENDKIM=0 - ENABLE_OPENDMARC=0
# - ENABLE_OPENDMARC=0 - ENABLE_POLICYD_SPF=0
# - ENABLE_POLICYD_SPF=0 - ENABLE_AMAVIS=0
# - ENABLE_AMAVIS=0 - ENABLE_SPAMASSASSIN=0
# - ENABLE_SPAMASSASSIN=0 - MOVE_SPAM_TO_JUNK=1
# - MOVE_SPAM_TO_JUNK=1 # only greylist spammy emails
# # only greylist spammy emails - RSPAMD_GREYLISTING=1
# - RSPAMD_GREYLISTING=1 # if ppl move mail to junk -> inbox (spam) or reverse (ham), learn from it
# # if ppl move mail to junk -> inbox (spam) or reverse (ham), learn from it - RSPAMD_LEARN=1
# - RSPAMD_LEARN=1 # some hostname heuristics for dodgy mailservers using wrong syntax - adds header only at the moment, test and drop when we trust
# # some hostname heuristics for dodgy mailservers using wrong syntax - adds header only at the moment, test and drop when we trust - RSPAMD_HFILTER=1
# - RSPAMD_HFILTER=1
##################################### rspam block ############################
# spoof prot stops anyone sending with an email address that doesn't match what they connected with # spoof prot stops anyone sending with an email address that doesn't match what they connected with
- SPOOF_PROTECTION=1 - SPOOF_PROTECTION=1
- ONE_DIR=1 - ONE_DIR=1
@@ -302,7 +292,6 @@ services:
- /srv/docker/config/secrets/ldap-mail-common - /srv/docker/config/secrets/ldap-mail-common
cap_add: cap_add:
- NET_ADMIN - NET_ADMIN
- SYS_PTRACE
openldap: openldap:
image: bitnami/openldap image: bitnami/openldap