github-personal/Mailu
1
0
Fork 0
mirror of https://github.com/outbackdingo/Mailu.git synced 2026-01-27 10:19:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent rspamc zombies, ensure that triggering learn-spam works

Browse Source
This commit is contained in:
Florent Daigniere
2023-08-15 10:14:27 +02:00
parent 32d1c7d899
commit a1f9fb4347
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/dovecot/conf/dovecot.conf
View File

@@ -180,7 +180,7 @@ plugin {
# Learn from spam
imapsieve_mailbox1_name = Junk
imapsieve_mailbox1_causes = COPY
imapsieve_mailbox1_causes = COPY APPEND
imapsieve_mailbox1_before = file:/conf/report-spam.sieve
imapsieve_mailbox2_name = *
imapsieve_mailbox2_from = Junk

6
core/dovecot/conf/ham.script
View File

@@ -6,6 +6,6 @@ then
exit 1
fi
tee >(rspamc -h $RSPAMD_HOST -P mailu learn_ham /dev/stdin) \
>(rspamc -h $RSPAMD_HOST -P mailu -f 11 fuzzy_del /dev/stdin) \
| rspamc -h $RSPAMD_HOST -P mailu -f 13 fuzzy_add /dev/stdin
exec tee >(rspamc -t 3 -h $RSPAMD_HOST -P mailu learn_ham /dev/stdin||true) \
>(rspamc -t 3 -h $RSPAMD_HOST -P mailu -f 11 fuzzy_del /dev/stdin||true) \
>(rspamc -t 3 -h $RSPAMD_HOST -P mailu -f 13 fuzzy_add /dev/stdin||true)

6
core/dovecot/conf/spam.script
View File

@@ -7,6 +7,6 @@ then
fi
tee >(rspamc -h $RSPAMD_HOST -P mailu learn_spam /dev/stdin) \
>(rspamc -h $RSPAMD_HOST -P mailu -f 13 fuzzy_del /dev/stdin) \
| rspamc -h $RSPAMD_HOST -P mailu -f 11 fuzzy_add /dev/stdin
exec tee >(rspamc -t 3 -h $RSPAMD_HOST -P mailu learn_spam /dev/stdin||true) \
>(rspamc -t 3 -h $RSPAMD_HOST -P mailu -f 13 fuzzy_del /dev/stdin||true) \
>(rspamc -t 3 -h $RSPAMD_HOST -P mailu -f 11 fuzzy_add /dev/stdin||true)

2
towncrier/newsfragments/2908.bugfix Normal file
View File

@@ -0,0 +1,2 @@
Moving emails to the Junk folder may have created zombies (rspamc)
Ensure that the spam reporting works even if the email isn't COPYed to the mailbox