@@ -10,9 +10,9 @@ lua = "$RULESDIR/rspamd.lua" | |||
.include "$CONFDIR/modules.conf" | |||
# User local settings | |||
.include(try=true) "$CONFDIR/rspamd.conf.local" | |||
.include(try=true,priority=10) "$CONFDIR/rspamd.conf.local.override" | |||
.include(try=true,priority=10) "$CONFDIR/rspamd.conf.override" | |||
.include(try=true) "$LOCAL_CONFDIR/rspamd.conf.local" | |||
.include(try=true,priority=10) "$LOCAL_CONFDIR/rspamd.conf.local.override" | |||
.include(try=true,priority=10) "$LOCAL_CONFDIR/rspamd.conf.override" | |||
modules { | |||
path = "$PLUGINSDIR/lua/" |
@@ -17,5 +17,5 @@ composite { | |||
expression = "(-RBL_SPAMHAUS_XBL | -RBL_SPAMHAUS_XBL1 | -RBL_SPAMHAUS_XBL2 | -RBL_SPAMHAUS_XBL3) & RECEIVED_SPAMHAUS_XBL"; | |||
} | |||
.include(try=true; priority=1) "$CONFDIR/local.d/composites.conf" | |||
.include(try=true; priority=10) "$CONFDIR/override.d/composites.conf" | |||
.include(try=true; priority=1) "$LOCAL_CONFDIR/local.d/composites.conf" | |||
.include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/composites.conf" |
@@ -1231,6 +1231,6 @@ metric { | |||
} | |||
} | |||
.include(try=true; priority=1) "$CONFDIR/local.d/metrics.conf" | |||
.include(try=true; priority=10) "$CONFDIR/override.d/metrics.conf" | |||
.include(try=true; priority=1) "$LOCAL_CONFDIR/local.d/metrics.conf" | |||
.include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/metrics.conf" | |||
} |
@@ -1,5 +1,7 @@ | |||
chartable { | |||
.include(try=true,priority=1) "${DBDIR}/dynamic/forged_recipients.conf" | |||
.include(try=true,priority=5) "${DBDIR}/dynamic/chartable.conf" | |||
.include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/chartable.conf" | |||
.include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/chartable.conf" | |||
threshold = 0.300000; | |||
symbol = "R_MIXED_CHARSET"; | |||
} | |||
} |
@@ -1,8 +1,10 @@ | |||
dkim { | |||
.include(try=true,priority=1) "${DBDIR}/dynamic/dkim.conf" | |||
.include(try=true,priority=5) "${DBDIR}/dynamic/dkim.conf" | |||
.include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/dkim.conf" | |||
.include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/dkim.conf" | |||
dkim_cache_size = 2k; | |||
dkim_cache_expire = 1d; | |||
time_jitter = 6h; | |||
trusted_only = false; | |||
skip_multi = false; | |||
} | |||
} |
@@ -1,3 +1,5 @@ | |||
dmarc { | |||
.include(try=true,priority=1) "${DBDIR}/dynamic/dmarc.conf" | |||
} | |||
.include(try=true,priority=5) "${DBDIR}/dynamic/dmarc.conf" | |||
.include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/dmarc.conf" | |||
.include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/dmarc.conf" | |||
} |
@@ -1,3 +1,5 @@ | |||
emails { | |||
.include(try=true,priority=1) "${DBDIR}/dynamic/emails.conf" | |||
} | |||
.include(try=true,priority=5) "${DBDIR}/dynamic/emails.conf" | |||
.include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/emails.conf" | |||
.include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/emails.conf" | |||
} |
@@ -1,5 +1,7 @@ | |||
forged_recipients { | |||
.include(try=true,priority=1) "${DBDIR}/dynamic/forged_recipients.conf" | |||
.include(try=true,priority=5) "${DBDIR}/dynamic/forged_recipients.conf" | |||
.include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/forged_recipients.conf" | |||
.include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/forged_recipients.conf" | |||
symbol_sender = "FORGED_SENDER"; | |||
symbol_rcpt = "FORGED_RECIPIENTS"; | |||
} | |||
} |
@@ -1,6 +1,8 @@ | |||
fuzzy_check { | |||
# Include dynamic conf for the rule | |||
.include(try=true,priority=1) "${DBDIR}/dynamic/fuzzy_check.conf" | |||
.include(try=true,priority=5) "${DBDIR}/dynamic/fuzzy_check.conf" | |||
.include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/fuzzy_check.conf" | |||
.include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/fuzzy_check.conf" | |||
min_bytes = 100; | |||
rule { | |||
servers = "rspamd.com:11335"; |
@@ -1,5 +1,7 @@ | |||
hfilter { | |||
.include(try=true,priority=1) "${DBDIR}/dynamic/hfilter.conf" | |||
.include(try=true,priority=5) "${DBDIR}/dynamic/hfilter.conf" | |||
.include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/hfilter.conf" | |||
.include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/hfilter.conf" | |||
helo_enabled = true; | |||
hostname_enabled = true; | |||
url_enabled = true; |
@@ -1,9 +1,11 @@ | |||
ip_score { | |||
.include(try=true,priority=1) "${DBDIR}/dynamic/ip_score.conf" | |||
.include(try=true,priority=5) "${DBDIR}/dynamic/ip_score.conf" | |||
.include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/ip_score.conf" | |||
.include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/ip_score.conf" | |||
# servers = "localhost"; | |||
# treshold = 100; | |||
# reject_score = 3; | |||
# no_action_score = -2; | |||
# add_header_score = 1; | |||
# whitelist = "file:///ip_map"; | |||
} | |||
} |
@@ -1,4 +1,6 @@ | |||
maillist { | |||
.include(try=true,priority=1) "${DBDIR}/dynamic/maillist.conf" | |||
.include(try=true,priority=5) "${DBDIR}/dynamic/maillist.conf" | |||
.include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/maillist.conf" | |||
.include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/maillist.conf" | |||
symbol = "MAILLIST"; | |||
} | |||
} |
@@ -1,4 +1,6 @@ | |||
mime_types { | |||
.include(try=true,priority=1) "${DBDIR}/dynamic/mime_types.conf" | |||
.include(try=true,priority=5) "${DBDIR}/dynamic/mime_types.conf" | |||
.include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/mime_types.conf" | |||
.include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/mime_types.conf" | |||
file = "${CONFDIR}/mime_types.inc"; | |||
} |
@@ -1,3 +1,5 @@ | |||
multimap { | |||
.include(try=true,priority=1) "${DBDIR}/dynamic/multimap.conf" | |||
} | |||
.include(try=true,priority=5) "${DBDIR}/dynamic/multimap.conf" | |||
.include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/multimap.conf" | |||
.include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/multimap.conf" | |||
} |
@@ -1,5 +1,7 @@ | |||
once_received { | |||
.include(try=true,priority=1) "${DBDIR}/dynamic/once_received.conf" | |||
.include(try=true,priority=5) "${DBDIR}/dynamic/once_received.conf" | |||
.include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/once_received.conf" | |||
.include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/once_received.conf" | |||
good_host = "mail"; | |||
bad_host = "static"; | |||
bad_host = "dynamic"; |
@@ -1,4 +1,6 @@ | |||
phishing { | |||
.include(try=true,priority=1) "${DBDIR}/dynamic/phishing.conf" | |||
.include(try=true,priority=5) "${DBDIR}/dynamic/phishing.conf" | |||
.include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/phishing.conf" | |||
.include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/phishing.conf" | |||
symbol = "PHISHING"; | |||
} | |||
} |
@@ -1,5 +1,7 @@ | |||
ratelimit { | |||
.include(try=true,priority=1) "${DBDIR}/dynamic/ratelimit.conf" | |||
.include(try=true,priority=5) "${DBDIR}/dynamic/ratelimit.conf" | |||
.include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/ratelimit.conf" | |||
.include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/ratelimit.conf" | |||
rates { | |||
# Limit for all mail per recipient (burst 100, rate 2 per minute) | |||
to = [100, 0.033333333]; |
@@ -1,5 +1,7 @@ | |||
rbl { | |||
.include(try=true,priority=5) "${DBDIR}/dynamic/rbl.conf" | |||
.include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/rbl.conf" | |||
.include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/rbl.conf" | |||
default_from = true; | |||
default_received = false; | |||
default_exclude_users = true; |
@@ -1,5 +1,7 @@ | |||
rspamd_update { | |||
.include(try=true,priority=1) "${DBDIR}/dynamic/rspamd_update.conf" | |||
.include(try=true,priority=5) "${DBDIR}/dynamic/rspamd_update.conf" | |||
.include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/rspamd_update.conf" | |||
.include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/rspamd_update.conf" | |||
rules = "sign+http://rspamd.com/update/rspamd-${BRANCH_VERSION}.ucl"; | |||
key = "qxuogdh5eghytji1utkkte1dn3n81c3y5twe61uzoddzwqzuxxyb"; | |||
} |
@@ -1,5 +1,7 @@ | |||
spf { | |||
.include(try=true,priority=1) "${DBDIR}/dynamic/spf.conf" | |||
.include(try=true,priority=5) "${DBDIR}/dynamic/spf.conf" | |||
.include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/spf.conf" | |||
.include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/spf.conf" | |||
spf_cache_size = 2k; | |||
spf_cache_expire = 1d; | |||
} | |||
} |
@@ -1,5 +1,7 @@ | |||
surbl { | |||
.include(try=true,priority=1) "${DBDIR}/dynamic/surbl.conf" | |||
.include(try=true,priority=5) "${DBDIR}/dynamic/surbl.conf" | |||
.include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/surbl.conf" | |||
.include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/surbl.conf" | |||
whitelist = "file://$CONFDIR/surbl-whitelist.inc"; | |||
exceptions = "file://$CONFDIR/2tld.inc"; | |||
@@ -1,5 +1,7 @@ | |||
whitelist { | |||
.include(try=true,priority=1) "${DBDIR}/dynamic/whitelist.conf" | |||
.include(try=true,priority=5) "${DBDIR}/dynamic/whitelist.conf" | |||
.include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/whitelist.conf" | |||
.include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/whitelist.conf" | |||
rules { | |||
"WHITELIST_SPF" = { | |||
valid_spf = true; | |||
@@ -29,4 +31,4 @@ whitelist { | |||
description = "Mail comes from the whitelisted domain and has valid DMARC and DKIM policies"; | |||
} | |||
} | |||
} | |||
} |
@@ -2,28 +2,28 @@ | |||
options { | |||
.include "$CONFDIR/options.inc" | |||
.include(try=true; priority=1) "$CONFDIR/local.d/options.inc" | |||
.include(try=true; priority=10) "$CONFDIR/override.d/options.inc" | |||
.include(try=true; priority=1) "$LOCAL_CONFDIR/local.d/options.inc" | |||
.include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/options.inc" | |||
} | |||
logging { | |||
type = "console"; | |||
systemd = true; | |||
.include "$CONFDIR/logging.inc" | |||
.include(try=true; priority=1) "$CONFDIR/local.d/logging.inc" | |||
.include(try=true; priority=10) "$CONFDIR/override.d/logging.inc" | |||
.include(try=true; priority=1) "$LOCAL_CONFDIR/local.d/logging.inc" | |||
.include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/logging.inc" | |||
} | |||
worker { | |||
bind_socket = "systemd:0"; | |||
.include "$CONFDIR/worker-normal.inc" | |||
.include(try=true; priority=1) "$CONFDIR/local.d/worker-normal.inc" | |||
.include(try=true; priority=10) "$CONFDIR/override.d/worker-normal.inc" | |||
.include(try=true; priority=1) "$LOCAL_CONFDIR/local.d/worker-normal.inc" | |||
.include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-normal.inc" | |||
} | |||
worker { | |||
bind_socket = "systemd:1"; | |||
.include "$CONFDIR/worker-controller.inc" | |||
.include(try=true; priority=1) "$CONFDIR/local.d/worker-controller.inc" | |||
.include(try=true; priority=10) "$CONFDIR/override.d/worker-controller.inc" | |||
.include(try=true; priority=1) "$LOCAL_CONFDIR/local.d/worker-controller.inc" | |||
.include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-controller.inc" | |||
} |
@@ -3,28 +3,28 @@ | |||
options { | |||
pidfile = "$RUNDIR/rspamd.pid"; | |||
.include "$CONFDIR/options.inc" | |||
.include(try=true; priority=1) "$CONFDIR/local.d/options.inc" | |||
.include(try=true; priority=10) "$CONFDIR/override.d/options.inc" | |||
.include(try=true; priority=1) "$LOCAL_CONFDIR/local.d/options.inc" | |||
.include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/options.inc" | |||
} | |||
logging { | |||
type = "file"; | |||
filename = "$LOGDIR/rspamd.log"; | |||
.include "$CONFDIR/logging.inc" | |||
.include(try=true; priority=1) "$CONFDIR/local.d/logging.inc" | |||
.include(try=true; priority=10) "$CONFDIR/override.d/logging.inc" | |||
.include(try=true; priority=1) "$LOCAL_CONFDIR/local.d/logging.inc" | |||
.include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/logging.inc" | |||
} | |||
worker { | |||
bind_socket = "*:11333"; | |||
.include "$CONFDIR/worker-normal.inc" | |||
.include(try=true; priority=1) "$CONFDIR/local.d/worker-normal.inc" | |||
.include(try=true; priority=10) "$CONFDIR/override.d/worker-normal.inc" | |||
.include(try=true; priority=1) "$LOCAL_CONFDIR/local.d/worker-normal.inc" | |||
.include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-normal.inc" | |||
} | |||
worker { | |||
bind_socket = "localhost:11334"; | |||
.include "$CONFDIR/worker-controller.inc" | |||
.include(try=true; priority=1) "$CONFDIR/local.d/worker-controller.inc" | |||
.include(try=true; priority=10) "$CONFDIR/override.d/worker-controller.inc" | |||
.include(try=true; priority=1) "$LOCAL_CONFDIR/local.d/worker-controller.inc" | |||
.include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-controller.inc" | |||
} |
@@ -25,6 +25,6 @@ classifier { | |||
path = "${DBDIR}/bayes.spam.sqlite"; | |||
spam = true; | |||
} | |||
.include(try=true; priority=1) "$CONFDIR/local.d/statistic.conf" | |||
.include(try=true; priority=10) "$CONFDIR/override.d/statistic.conf" | |||
.include(try=true; priority=1) "$LOCAL_CONFDIR/local.d/statistic.conf" | |||
.include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/statistic.conf" | |||
} |