RedXen/aports
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reorder config

Browse Source
This commit is contained in:
Alex D. 2022-05-07 10:14:30 +00:00
parent 806e0e48fd
commit 8f751d10c9
Signed by: caskd
GPG Key ID: F92BA85F61F4C173
4 changed files with 49 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/rspamd/APKBUILD
View File

@ -3,7 +3,7 @@
. ../APKBUILD-config.template . ../APKBUILD-config.template
pkgver=2022.04.25.02 pkgver=2022.05.04.01
pkgrel=0 pkgrel=0
_baseconf=" _baseconf="
rspamd.conf rspamd.conf
@ -22,6 +22,7 @@ _modules="
dmarc dmarc
fuzzy_check fuzzy_check
force_actions force_actions
forged_recipients
greylist greylist
hfilter hfilter
maillist maillist
@ -82,7 +83,7 @@ _module() {
} }
sha512sums=" sha512sums="
54032ade2f787e80d6b7f4ed443774deb5bd8acec90bcb5f7127022f1733ae2c1bb81ce250327466137bd293a8476266867c8aa9f9f4c265156df5836fb9173d rspamd.conf e697ed4add5374540a2564f41584cf39cb513a452674cb1dd43f50e5b81fc2ca735d54c0bc35ccab3a741995d1806d6be0cc0a7e90bb53c430e9fb8265588470 rspamd.conf
1a89af285100e055de0d0a075c36fc35e5b0dc7bbcc61b8932b4022bcd0890f2fb5d54ed3d71609234ce4236320e9ec1653bafd022c0da73fb4f965da9cb132d composites.conf 1a89af285100e055de0d0a075c36fc35e5b0dc7bbcc61b8932b4022bcd0890f2fb5d54ed3d71609234ce4236320e9ec1653bafd022c0da73fb4f965da9cb132d composites.conf
99d6b2b173ac5b62977562bb3f2d04cf29d3d94329a4b2abc120e6cca6da79d5ac2a35a16832f62b8e1fed331b6724f21b5e1aab076bd3c57b28b2261302238a logging.conf 99d6b2b173ac5b62977562bb3f2d04cf29d3d94329a4b2abc120e6cca6da79d5ac2a35a16832f62b8e1fed331b6724f21b5e1aab076bd3c57b28b2261302238a logging.conf
e40a35928fe429c98301a4fd25d6fb71801ad0a78fa244423726df0bf069950756c77a1d03c77b8dcdae8eda27d3dd95ab67964fad005b90547fafb12718c28d statistic.conf e40a35928fe429c98301a4fd25d6fb71801ad0a78fa244423726df0bf069950756c77a1d03c77b8dcdae8eda27d3dd95ab67964fad005b90547fafb12718c28d statistic.conf

47
config/rspamd/modules/force_actions.conf
View File

@ -1,5 +1,10 @@
force_actions { force_actions {
rules { rules {
INVALID_DATE_ACTION {
expression = "INVALID_DATE";
action = "reject";
message = "Mail contains a invalid date";
}
ANY_FUZZY_DENIED_ACTION { ANY_FUZZY_DENIED_ACTION {
expression = "ANY_FUZZY_DENIED"; expression = "ANY_FUZZY_DENIED";
action = "reject"; action = "reject";
@ -10,10 +15,6 @@ force_actions {
action = "reject"; action = "reject";
message = "DMARC failed"; message = "DMARC failed";
} }
DMARC_POLICY_QUARANTINE_ACTION {
expression = "DMARC_POLICY_QUARANTINE";
action = "add header";
}
ARC_REJECT_ACTION { ARC_REJECT_ACTION {
expression = "ARC_REJECT"; expression = "ARC_REJECT";
action = "reject"; action = "reject";
@ -34,26 +35,11 @@ force_actions {
action = "reject"; action = "reject";
message = "Mail sender / contents are listed on SPAMHAUS DROP"; message = "Mail sender / contents are listed on SPAMHAUS DROP";
} }
RBL_SPAMHAUS_XBL_ANY_ACTION {
expression = "RBL_SPAMHAUS_XBL_ANY";
action = "soft reject";
message = "Mail sender / contents are listed on SPAMHAUS XBL";
}
URIBL_BLACK_ACTION { URIBL_BLACK_ACTION {
expression = "URIBL_BLACK"; expression = "URIBL_BLACK";
action = "reject"; action = "reject";
message = "You are listed on URIBL black"; message = "You are listed on URIBL black";
} }
URIBL_GREY_ACTION {
expression = "URIBL_GREY";
action = "soft reject";
message = "You are listed on URIBL grey";
}
RBL_MAILSPIKE_BAD_ACTION {
expression = "RBL_MAILSPIKE_BAD";
action = "soft reject";
message = "You are listed on Mailspike as bad";
}
RBL_MAILSPIKE_VERYBAD_ACTION { RBL_MAILSPIKE_VERYBAD_ACTION {
expression = "RBL_MAILSPIKE_VERYBAD"; expression = "RBL_MAILSPIKE_VERYBAD";
action = "reject"; action = "reject";
@ -69,5 +55,28 @@ force_actions {
action = "reject"; action = "reject";
message = "Thank you kind sir"; message = "Thank you kind sir";
} }
RBL_SPAMHAUS_XBL_ANY_ACTION {
expression = "RBL_SPAMHAUS_XBL_ANY";
action = "soft reject";
honor_action = ["reject"];
message = "Mail sender / contents are listed on SPAMHAUS XBL";
}
URIBL_GREY_ACTION {
expression = "URIBL_GREY";
action = "soft reject";
honor_action = ["reject"];
message = "You are listed on URIBL grey";
}
RBL_MAILSPIKE_BAD_ACTION {
expression = "RBL_MAILSPIKE_BAD";
action = "soft reject";
honor_action = ["reject"];
message = "You are listed on Mailspike as bad";
}
DMARC_POLICY_QUARANTINE_ACTION {
expression = "DMARC_POLICY_QUARANTINE";
action = "add header";
honor_action = ["reject", "soft reject"];
}
} }
} }

4
config/rspamd/modules/forged_recipients.conf Normal file
View File

@ -0,0 +1,4 @@
forged_recipients {
symbol_sender = "FORGED_SENDER";
symbol_rcpt = "FORGED_RECIPIENTS";
}

28
config/rspamd/rspamd.conf
View File

@ -1,6 +1,18 @@
.include "/etc/redxen/rspamd/workers.conf"
.include "/etc/redxen/rspamd/logging.conf"
.include "/etc/redxen/rspamd/composites.conf"
.include "/etc/redxen/rspamd/statistic.conf"
lua = "$RULESDIR/rspamd.lua"
modules {
path = "${PLUGINSDIR}";
}
.include(glob=true) "/etc/redxen/rspamd/modules/*.conf"
.include(glob=true) "/etc/redxen/rspamd/scores/*.conf"
options { options {
pidfile = "$RUNDIR/rspamd.pid"; pidfile = "$RUNDIR/rspamd.pid";
filters = "ratelimit,mx_check,dkim,spf,arc,dmarc,maillist,fuzzy_check,chartable,phishing,rbl,hfilter,forged_recipients,greylist,milter_headers,redis,force_actions"; filters = "ratelimit,mx_check,dkim,spf,arc,dmarc,maillist,fuzzy_check,chartable,phishing,rbl,hfilter,forged_recipients,greylist,redis,force_actions,milter_headers";
raw_mode = false; raw_mode = false;
one_shot = false; one_shot = false;
map_watch_interval = 5min; map_watch_interval = 5min;
@ -37,7 +49,7 @@ options {
hs_cache_dir = "${DBDIR}/"; hs_cache_dir = "${DBDIR}/";
# Timeout for messages processing (must be larger than any internal timeout used) # Timeout for messages processing (must be larger than any internal timeout used)
task_timeout = 8s; task_timeout = 10s;
whitelist { whitelist {
priority = low; priority = low;
@ -62,15 +74,3 @@ actions {
add_header = 5; add_header = 5;
greylist = 1; greylist = 1;
} }
.include "/etc/redxen/rspamd/workers.conf"
.include "/etc/redxen/rspamd/logging.conf"
.include "/etc/redxen/rspamd/composites.conf"
.include "/etc/redxen/rspamd/statistic.conf"
lua = "$RULESDIR/rspamd.lua"
modules {
path = "${PLUGINSDIR}";
}
.include(glob=true) "/etc/redxen/rspamd/modules/*.conf"
.include(glob=true) "/etc/redxen/rspamd/scores/*.conf"