self-hosted/Mailu
1
0
Fork 0
mirror of https://github.com/Mailu/Mailu.git synced 2025-04-13 11:40:41 +02:00
Code Issues Releases Activity

Merge pull request #433 from mildred/delivered-to-hdr

Browse Source 
Add original Delivered-To header to received messages
This commit is contained in:
kaiyou 2018-04-11 21:53:30 +02:00 committed by GitHub
commit e92113bd57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,7 +138,7 @@ service managesieve {
plugin { plugin {
sieve = file:~/sieve;active=~/.dovecot.sieve sieve = file:~/sieve;active=~/.dovecot.sieve
sieve_plugins = sieve_extdata sieve_imapsieve sieve_extprograms sieve_plugins = sieve_extdata sieve_imapsieve sieve_extprograms
sieve_global_extensions = +vnd.dovecot.extdata +spamtest +spamtestplus +vnd.dovecot.execute sieve_global_extensions = +vnd.dovecot.extdata +spamtest +spamtestplus +vnd.dovecot.execute +editheader
sieve_before = /var/lib/dovecot/before.sieve sieve_before = /var/lib/dovecot/before.sieve
sieve_default = /var/lib/dovecot/default.sieve sieve_default = /var/lib/dovecot/default.sieve
sieve_after = /var/lib/dovecot/after.sieve sieve_after = /var/lib/dovecot/after.sieve

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

@ -11,6 +11,14 @@ require "comparator-i;ascii-numeric";
require "vnd.dovecot.extdata"; require "vnd.dovecot.extdata";
require "vnd.dovecot.execute"; require "vnd.dovecot.execute";
require "spamtestplus"; require "spamtestplus";
require "editheader";
require "index";
if header :index 2 :matches "Received" "from * by * for <*>; *"
{
deleteheader "Delivered-To";
addheader "Delivered-To" "<${3}>";
}
if allof (string :is "${extdata.spam_enabled}" "1", if allof (string :is "${extdata.spam_enabled}" "1",
spamtest :percent :value "gt" :comparator "i;ascii-numeric" "${extdata.spam_threshold}") spamtest :percent :value "gt" :comparator "i;ascii-numeric" "${extdata.spam_threshold}")