7x31/mailcow-dockerized
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #915 from tiirex9/master

Browse Source 
Adds 'do nothing' as default for sub-addressing
This commit is contained in:
André Peters
2018-01-18 10:27:14 +01:00
committed by GitHub
parent 79cb929911 d58b89528f
commit 5648ec6d39
12 changed files with 44 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
data/conf/rspamd/local.d/multimap.conf
View File

@@ -6,10 +6,16 @@ RCPT_MAILCOW_DOMAIN {
RCPT_WANTS_SUBJECT_TAG {
type = "rcpt";
filter = "email:addr"
filter = "email:addr";
map = "redis://RCPT_WANTS_SUBJECT_TAG";
}
RCPT_WANTS_SUBFOLDER_TAG {
type = "rcpt";
filter = "email:addr";
map = "redis://RCPT_WANTS_SUBFOLDER_TAG";
}
WHITELISTED_FWD_HOST {
type = "ip";
map = "redis://WHITELISTED_FWD_HOST";

3
data/conf/rspamd/lua/rspamd.local.lua
View File

@@ -30,6 +30,7 @@ rspamd_config:register_symbol({
end
local wants_subject_tag = task:get_symbol("RCPT_WANTS_SUBJECT_TAG")
local wants_subfolder_tag = task:get_symbol("RCPT_WANTS_SUBFOLDER_TAG")
if wants_subject_tag then
rspamd_logger.infox("user wants subject modified for tagged mail")
@@ -39,7 +40,7 @@ rspamd_config:register_symbol({
remove_headers = {['Subject'] = 1},
add_headers = {['Subject'] = new_sbj}
})
else
elseif wants_subfolder_tag then
rspamd_logger.infox("Add X-Moo-Tag header")
task:set_milter_reply({
add_headers = {['X-Moo-Tag'] = 'YES'}