self-hosted/Mailu
1
0
Fork 0
mirror of https://github.com/Mailu/Mailu.git synced 2025-07-15 01:24:34 +02:00
Code Issues Releases Activity

Use rspamd as a milter service instead of deprecated rmilter

Browse Source
This commit is contained in:
kaiyou
2017-11-05 16:54:23 +01:00
parent f943dc85a2
commit 1d9b3b00a7
12 changed files with 46 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/dovecot/conf/dovecot.conf
View File

@ -155,11 +155,10 @@ plugin {
# Include the recipient in vacation replies so that DKIM applies # Include the recipient in vacation replies so that DKIM applies
sieve_vacation_send_from_recipient = yes sieve_vacation_send_from_recipient = yes
# extract spam score from # extract spam score from headers
# X-Spam-Result: .... [<value> / <max_value] ... sieve_spamtest_status_type = strlen
sieve_spamtest_status_type = score sieve_spamtest_status_header = X-Spam-Level
sieve_spamtest_status_header = X-Spamd-Result: .*\[(-?[[:digit:]]+\.[[:digit:]]+) .*\] sieve_spamtest_max_value = 15
sieve_spamtest_max_header = X-Spamd-Result: .*\[.* ([[:digit:]]+\.[[:digit:]]+)\]
# Learn from spam # Learn from spam
imapsieve_mailbox1_name = Junk imapsieve_mailbox1_name = Junk

5
core/dovecot/sieve/before.sieve
View File

@ -19,6 +19,11 @@ if allof (string :is "${extdata.spam_enabled}" "1",
stop; stop;
} }
if exists "X-Virus" {
discard;
stop;
}
if string :is "${extdata.reply_enabled}" "1" { if string :is "${extdata.reply_enabled}" "1" {
vacation :days 1 :subject "${extdata.reply_subject}" "${extdata.reply_body}"; vacation :days 1 :subject "${extdata.reply_subject}" "${extdata.reply_body}";
} }

2
core/postfix/conf/main.cf
View File

@ -93,7 +93,7 @@ smtpd_recipient_restrictions =
# Milter # Milter
############### ###############
smtpd_milters = inet:milter:9900 smtpd_milters = inet:antispam:9900
milter_protocol = 6 milter_protocol = 6
milter_mail_macros = i {mail_addr} {client_addr} {client_name} {auth_authen} milter_mail_macros = i {mail_addr} {client_addr} {client_name} {auth_authen}
milter_default_action = tempfail milter_default_action = tempfail

7
services/rspamd/Dockerfile
View File

@ -1,12 +1,9 @@
FROM alpine:edge FROM alpine:edge
# We have to upgrade musl, or rspamd will not work. RUN apk add --no-cache rspamd ca-certificates
RUN echo 'http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories \
&& apk add --no-cache rspamd rsyslog ca-certificates
RUN mkdir /run/rspamd RUN mkdir /run/rspamd
COPY conf/ /etc/rspamd COPY conf/ /etc/rspamd
COPY start.sh /start.sh
CMD ["/start.sh"] CMD ["rspamd", "-i", "-f"]

6
services/rspamd/conf/local.d/antivirus.conf Normal file
View File

@ -0,0 +1,6 @@
clamav {
attachments_only = true;
symbol = "CLAM_VIRUS";
type = "clamav";
servers = "antivirus:3310";
}

2
services/rspamd/conf/local.d/dkim_signing.conf Normal file
View File

@ -0,0 +1,2 @@
try_fallback = true;
path = "/dkim/$domain.$selector.key";

1
services/rspamd/conf/local.d/logging.inc Normal file
View File

@ -0,0 +1 @@
type=console

11
services/rspamd/conf/local.d/milter_headers.conf Normal file
View File

@ -0,0 +1,11 @@
authenticated_headers = ["authentication-results"];
skip_local = false;
skip_authenticated = false;
use = ["x-spamd-bar", "x-spam-level", "x-virus", "authentication-results"];
routines {
x-virus {
symbols = ["CLAM_VIRUS", "FPROT_VIRUS", "JUST_EICAR"];
}
}

1
services/rspamd/conf/local.d/redis.conf Normal file
View File

@ -0,0 +1 @@
servers = "redis";

1
services/rspamd/conf/local.d/worker-normal.inc Normal file
View File

@ -0,0 +1 @@
enabled = false;

8
services/rspamd/conf/local.d/worker-proxy.inc Normal file
View File

@ -0,0 +1,8 @@
bind_socket = "*:11332";
type = "proxy";
milter = yes;
timeout = 120s;
upstream "local" {
default = yes;
self_scan = yes;
}

9
services/rspamd/conf/worker-normal.conf → services/rspamd/conf/worker-proxy.conf
View File

@ -1,6 +1,5 @@
worker { worker "rspamd_proxy" {
bind_socket = "*:11333"; bind_socket = "*:11332";
.include "$CONFDIR/worker-normal.inc" .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-proxy.inc"
.include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-normal.inc" .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-proxy.inc"
.include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-normal.inc"
} }