external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2024-11-26 02:57:04 +00:00
Code Issues Releases Wiki Activity

[merge] Disable encapsulation of spam and marking of it as seen

Browse Source 
is #254 plus a longer comment, fixes #243
This commit is contained in:
Joshua Tauberer 2014-10-31 11:20:47 +00:00
commit de0ccd0632
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
conf/sieve-spam.txt
View File

@ -1,7 +1,6 @@
require ["regex", "fileinto", "imap4flags"]; require ["regex", "fileinto", "imap4flags"];
if allof (header :regex "X-Spam-Status" "^Yes") { if allof (header :regex "X-Spam-Status" "^Yes") {
setflag "\\Seen";
fileinto "Spam"; fileinto "Spam";
stop; stop;
} }

14
setup/spamassassin.sh
View File

@ -30,6 +30,20 @@ hide_output pyzor discover
# We've already configured Dovecot to listen on this port. # We've already configured Dovecot to listen on this port.
tools/editconf.py /etc/default/spampd DESTPORT=10026 tools/editconf.py /etc/default/spampd DESTPORT=10026
# Spamassassin normally wraps spam as an attachment inside a fresh
# email with a report about the message. This also protects the user
# from accidentally openening a message with embedded malware.
#
# It's nice to see what rules caused the message to be marked as spam,
# but it's also annoying to get to the original message when it is an
# attachment, modern mail clients are safer now and don't load remote
# content or execute scripts, and it is probably confusing to most users.
#
# Tell Spamassassin not to modify the original message except for adding
# the X-Spam-Status mail header and related headers.
tools/editconf.py /etc/spamassassin/local.cf -s \
report_safe=0
# Bayesean learning # Bayesean learning
# ----------------- # -----------------
# #