Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Consider local-part-suffix addresses during routing of spam mails #220

Merged
merged 1 commit into from
Sep 10, 2016
Merged

Consider local-part-suffix addresses during routing of spam mails #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion docs/configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,6 +547,10 @@ ditch_malware:
and users.on_avscan = '1' \
and domains.avscan = '1' \
and users.domain_id=domains.domain_id}}}{1} }} {yes}{no} }
.ifdef VEXIM_LOCALPART_SUFFIX
local_part_suffix = VEXIM_LOCALPART_SUFFIX
local_part_suffix_optional
.endif

# spam drop router
ditch_spam_drop:
Expand All @@ -561,6 +565,10 @@ ditch_spam_drop:
and users.spam_drop = '1' \
and users.domain_id=domains.domain_id \
and users.sa_refuse > 0 }{$value}fail}} {yes}{no}}
.ifdef VEXIM_LOCALPART_SUFFIX
local_part_suffix = VEXIM_LOCALPART_SUFFIX
local_part_suffix_optional
.endif
retry_use_local_part

ditch_spam:
Expand All @@ -585,11 +593,15 @@ ditch_spam:
and users.type = 'local' \
and users.domain_id=domains.domain_id \
and users.sa_refuse > 0 }{$value}fail}} {yes}{no}}
retry_use_local_part
headers_add = ${if and { \
{match{$domain}{$original_domain}} \
{match{$local_part}{$original_local_part}} \
} {X-Spam-Flag: YES\nX-Spam-Score: $acl_m_spam_score\nVEXIM_SPAM_REPORT_HEADER_NAME: $acl_m_spam_report}{} }
.ifdef VEXIM_LOCALPART_SUFFIX
local_part_suffix = VEXIM_LOCALPART_SUFFIX
local_part_suffix_optional
.endif
retry_use_local_part

Copy link
Collaborator

@rimas-kudelis rimas-kudelis Sep 8, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pls remove this blank line and I think we're good.

ditch_hdrmailer:
driver = redirect
Expand Down
14 changes: 13 additions & 1 deletion docs/debian-conf.d/router/249_vexim_ditch_routers
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ ditch_malware:
and users.on_avscan = '1' \
and domains.avscan = '1' \
and users.domain_id=domains.domain_id}}}{1} }} {yes}{no} }
.ifdef VEXIM_LOCALPART_SUFFIX
local_part_suffix = VEXIM_LOCALPART_SUFFIX
local_part_suffix_optional
.endif

# spam drop router
ditch_spam_drop:
Expand All @@ -55,6 +59,10 @@ ditch_spam_drop:
and users.spam_drop = '1' \
and users.domain_id=domains.domain_id \
and users.sa_refuse > 0 }{$value}fail}} {yes}{no}}
.ifdef VEXIM_LOCALPART_SUFFIX
local_part_suffix = VEXIM_LOCALPART_SUFFIX
local_part_suffix_optional
.endif
retry_use_local_part

ditch_spam:
Expand All @@ -79,11 +87,15 @@ ditch_spam:
and users.type = 'local' \
and users.domain_id=domains.domain_id \
and users.sa_refuse > 0 }{$value}fail}} {yes}{no}}
retry_use_local_part
headers_add = ${if and { \
{match{$domain}{$original_domain}} \
{match{$local_part}{$original_local_part}} \
} {X-Spam-Flag: YES\nX-Spam-Score: $acl_m_spam_score\nVEXIM_SPAM_REPORT_HEADER_NAME: $acl_m_spam_report}{} }
.ifdef VEXIM_LOCALPART_SUFFIX
local_part_suffix = VEXIM_LOCALPART_SUFFIX
local_part_suffix_optional
.endif
retry_use_local_part

ditch_hdrmailer:
driver = redirect
Expand Down