diff options
Diffstat (limited to 'conf/modules.d')
| -rw-r--r-- | conf/modules.d/arc.conf | 2 | ||||
| -rw-r--r-- | conf/modules.d/bimi.conf | 2 | ||||
| -rw-r--r-- | conf/modules.d/clickhouse.conf | 1 | ||||
| -rw-r--r-- | conf/modules.d/multimap.conf | 1 | ||||
| -rw-r--r-- | conf/modules.d/rbl.conf | 40 | ||||
| -rw-r--r-- | conf/modules.d/redis.conf | 2 | ||||
| -rw-r--r-- | conf/modules.d/spamassassin.conf | 2 |
7 files changed, 33 insertions, 17 deletions
diff --git a/conf/modules.d/arc.conf b/conf/modules.d/arc.conf index 4b5682b77..f26dad86e 100644 --- a/conf/modules.d/arc.conf +++ b/conf/modules.d/arc.conf @@ -44,7 +44,7 @@ arc { # If false, messages from local networks are not selected for signing sign_local = false; # Symbol to add when message is signed - symbol_sign = "ARC_SIGNED"; + sign_symbol = "ARC_SIGNED"; # Whether to fallback to global config try_fallback = true; # Domain to use for ARC signing: can be "header", "envelope" or "recipient" diff --git a/conf/modules.d/bimi.conf b/conf/modules.d/bimi.conf index 63c0f7135..91f48b601 100644 --- a/conf/modules.d/bimi.conf +++ b/conf/modules.d/bimi.conf @@ -26,4 +26,4 @@ bimi { .include(try=true,priority=5) "${DBDIR}/dynamic/bimi.conf" .include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/bimi.conf" .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/bimi.conf" -}
\ No newline at end of file +} diff --git a/conf/modules.d/clickhouse.conf b/conf/modules.d/clickhouse.conf index dc176c664..5edf710d5 100644 --- a/conf/modules.d/clickhouse.conf +++ b/conf/modules.d/clickhouse.conf @@ -12,7 +12,6 @@ # # Module documentation can be found at https://rspamd.com/doc/modules/clickhouse.html - clickhouse { # Push update when 1000 records are collected (1000 if unset) limit = 1000; diff --git a/conf/modules.d/multimap.conf b/conf/modules.d/multimap.conf index 5713c8368..6c4f25bd5 100644 --- a/conf/modules.d/multimap.conf +++ b/conf/modules.d/multimap.conf @@ -173,4 +173,3 @@ url_tld_re { symbol = "URL_MAP_RE"; } */ - diff --git a/conf/modules.d/rbl.conf b/conf/modules.d/rbl.conf index 94b3ee7c6..e3ece5a66 100644 --- a/conf/modules.d/rbl.conf +++ b/conf/modules.d/rbl.conf @@ -23,6 +23,14 @@ rbl { "fallback+file://${CONFDIR}/maps.d/surbl-whitelist.inc" ]; + attached_maps = [ + { + selector_alias = "surbl_hashbl_map", + description = "SURBL hashbl map", + url = "regexp;http://sa-update.surbl.org/rspamd/surbl-hashbl-map.inc", + } + ] + rbls { spamhaus { @@ -38,8 +46,7 @@ rbl { returncodes { SPAMHAUS_SBL = "127.0.0.2"; SPAMHAUS_CSS = "127.0.0.3"; - SPAMHAUS_XBL = ["127.0.0.4", "127.0.0.5", - "127.0.0.6", "127.0.0.7"]; + SPAMHAUS_XBL = ["127.0.0.4", "127.0.0.5", "127.0.0.6", "127.0.0.7"]; SPAMHAUS_PBL = ["127.0.0.10", "127.0.0.11"]; SPAMHAUS_DROP = "127.0.0.9"; SPAMHAUS_BLOCKED_OPENRESOLVER = "127.255.255.254"; @@ -170,6 +177,7 @@ rbl { RSPAMD_EMAILBL = "127.0.0.2"; } } + MSBL_EBL { ignore_whitelist = true; ignore_defaults = true; @@ -189,7 +197,7 @@ rbl { ]; } } - # Old SURBL module + "SURBL_MULTI" { ignore_defaults = true; rbl = "multi.surbl.org"; @@ -198,7 +206,7 @@ rbl { exclude_users = false; returnbits = { - CRACKED_SURBL = 128; # From February 2016 + CRACKED_SURBL = 128; ABUSE_SURBL = 64; MW_SURBL_MULTI = 16; PH_SURBL_MULTI = 8; @@ -206,6 +214,23 @@ rbl { } } + SURBL_HASHBL { + rbl = "hashbl.surbl.org"; + ignore_defaults = true; + random_monitored = true, + # TODO: make limit more configurable maybe? + selector = "specific_urls_filter_map('surbl_hashbl_map', {limit = 10}).apply_methods('get_host', 'get_path').join_tables('/')", + hash = 'md5'; + hash_len = 32; + returncodes = { + SURBL_HASHBL_PHISH = "127.0.0.8"; + SURBL_HASHBL_MALWARE = "127.0.0.16"; + SURBL_HASHBL_ABUSE = "127.0.0.64"; + SURBL_HASHBL_CRACKED = "127.0.0.128"; + SURBL_HASHBL_EMAIL = "127.0.1.%d+"; + } + } + "URIBL_MULTI" { ignore_defaults = true; rbl = "multi.uribl.com"; @@ -309,13 +334,6 @@ rbl { SEM_URIBL_FRESH15 = 2; } } - - # Proved to be broken - #"RBL_SARBL_BAD" { - # suffix = "public.sarbl.org"; - # noip = true; - # images = true; - #} } .include(try=true,priority=5) "${DBDIR}/dynamic/rbl.conf" diff --git a/conf/modules.d/redis.conf b/conf/modules.d/redis.conf index 9fec0a241..eb430cbb1 100644 --- a/conf/modules.d/redis.conf +++ b/conf/modules.d/redis.conf @@ -23,4 +23,4 @@ redis { .include(try=true,priority=5) "${DBDIR}/dynamic/redis.conf" .include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/redis.conf" .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/redis.conf" -}
\ No newline at end of file +} diff --git a/conf/modules.d/spamassassin.conf b/conf/modules.d/spamassassin.conf index 054443071..79f75270f 100644 --- a/conf/modules.d/spamassassin.conf +++ b/conf/modules.d/spamassassin.conf @@ -23,4 +23,4 @@ spamassassin { .include(try=true,priority=5) "${DBDIR}/dynamic/spamassassin.conf" .include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/spamassassin.conf" .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/spamassassin.conf" -}
\ No newline at end of file +} |