Mirrors
/
rspamd
mirror of https://github.com/rspamd/rspamd.git
3
0
Fork 0
Code Releases Activity
Browse Source

[Fix] Really fix local.d includes

pull/762/head
Vsevolod Stakhov 9 years ago
parent
f28ccc4b9f
commit
6c28bbc16b
20 changed files with 69 additions and 57 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      conf/modules.d/chartable.conf
  2. 7
      conf/modules.d/dkim.conf
  3. 2
      conf/modules.d/emails.conf
  4. 7
      conf/modules.d/forged_recipients.conf
  5. 7
      conf/modules.d/hfilter.conf
  6. 6
      conf/modules.d/ip_score.conf
  7. 4
      conf/modules.d/maillist.conf
  8. 7
      conf/modules.d/mime_types.conf
  9. 2
      conf/modules.d/multimap.conf
  10. 7
      conf/modules.d/once_received.conf
  11. 6
      conf/modules.d/phishing.conf
  12. 7
      conf/modules.d/ratelimit.conf
  13. 7
      conf/modules.d/rbl.conf
  14. 5
      conf/modules.d/regexp.conf
  15. 7
      conf/modules.d/rspamd_update.conf
  16. 7
      conf/modules.d/spf.conf
  17. 7
      conf/modules.d/surbl.conf
  18. 7
      conf/modules.d/whitelist.conf
  19. 8
      conf/rspamd.systemd.conf
  20. 10
      conf/rspamd.sysvinit.conf

6
conf/modules.d/chartable.conf
View File

@ -14,9 +14,9 @@
# See https://rspamd.com/doc/tutorials/writing_rules.html for details
chartable {
.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";
.include(try=true,priority=5) "${DBDIR}/dynamic/chartable.conf"
.include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/chartable.conf"
.include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/chartable.conf"
}

7
conf/modules.d/dkim.conf
View File

@ -14,12 +14,13 @@
# See https://rspamd.com/doc/tutorials/writing_rules.html for details
dkim {
.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;
.include(try=true,priority=5) "${DBDIR}/dynamic/dkim.conf"
.include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/dkim.conf"
.include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/dkim.conf"
}

2
conf/modules.d/emails.conf
View File

@ -15,6 +15,6 @@
emails {
.include(try=true,priority=5) "${DBDIR}/dynamic/emails.conf"
.include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/emails.conf"
.include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/emails.conf"
.include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/emails.conf"
}

7
conf/modules.d/forged_recipients.conf
View File

@ -14,9 +14,10 @@
# See https://rspamd.com/doc/tutorials/writing_rules.html for details
forged_recipients {
.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";
.include(try=true,priority=5) "${DBDIR}/dynamic/forged_recipients.conf"
.include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/forged_recipients.conf"
.include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/forged_recipients.conf"
}

7
conf/modules.d/hfilter.conf
View File

@ -14,9 +14,6 @@
# See https://rspamd.com/doc/tutorials/writing_rules.html for details
hfilter {
.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;
@ -24,4 +21,8 @@ hfilter {
rcpt_enabled = true;
mid_enabled = false;
rcpt_enabled = true;
.include(try=true,priority=5) "${DBDIR}/dynamic/hfilter.conf"
.include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/hfilter.conf"
.include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/hfilter.conf"
}

6
conf/modules.d/ip_score.conf
View File

@ -14,13 +14,13 @@
# See https://rspamd.com/doc/tutorials/writing_rules.html for details
ip_score {
.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";
.include(try=true,priority=5) "${DBDIR}/dynamic/ip_score.conf"
.include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/ip_score.conf"
.include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/ip_score.conf"
}

4
conf/modules.d/maillist.conf
View File

@ -14,8 +14,8 @@
# See https://rspamd.com/doc/tutorials/writing_rules.html for details
maillist {
symbol = "MAILLIST";
.include(try=true,priority=5) "${DBDIR}/dynamic/maillist.conf"
.include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/maillist.conf"
.include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/maillist.conf"
.include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/maillist.conf"
symbol = "MAILLIST";
}

7
conf/modules.d/mime_types.conf
View File

@ -14,9 +14,6 @@
# See https://rspamd.com/doc/tutorials/writing_rules.html for details
mime_types {
.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";
# Match specific extensions to specific content types
@ -32,4 +29,8 @@ mime_types {
"application/pdf"
];
}
.include(try=true,priority=5) "${DBDIR}/dynamic/mime_types.conf"
.include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/mime_types.conf"
.include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/mime_types.conf"
}

2
conf/modules.d/multimap.conf
View File

@ -15,7 +15,7 @@
multimap {
.include(try=true,priority=5) "${DBDIR}/dynamic/multimap.conf"
.include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/multimap.conf"
.include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/multimap.conf"
.include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/multimap.conf"
}

7
conf/modules.d/once_received.conf
View File

@ -14,12 +14,13 @@
# See https://rspamd.com/doc/tutorials/writing_rules.html for details
once_received {
.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";
symbol_strict = "ONCE_RECEIVED_STRICT";
symbol = "ONCE_RECEIVED";
.include(try=true,priority=5) "${DBDIR}/dynamic/once_received.conf"
.include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/once_received.conf"
.include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/once_received.conf"
}

6
conf/modules.d/phishing.conf
View File

@ -14,9 +14,6 @@
# See https://rspamd.com/doc/tutorials/writing_rules.html for details
phishing {
.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";
# Disabled by default
openphish_enabled = false;
@ -32,4 +29,7 @@ phishing {
"$LOCAL_CONFDIR/local.d/redirectors.inc:LOCAL_REDIRECTOR_FALSE"
];
.include(try=true,priority=5) "${DBDIR}/dynamic/phishing.conf"
.include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/phishing.conf"
.include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/phishing.conf"
}

7
conf/modules.d/ratelimit.conf
View File

@ -14,9 +14,6 @@
# See https://rspamd.com/doc/tutorials/writing_rules.html for details
ratelimit {
.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];
@ -35,4 +32,8 @@ ratelimit {
#symbol = "R_RATELIMIT";
whitelisted_rcpts = "postmaster,mailer-daemon";
max_rcpt = 5;
.include(try=true,priority=5) "${DBDIR}/dynamic/ratelimit.conf"
.include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/ratelimit.conf"
.include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/ratelimit.conf"
}

7
conf/modules.d/rbl.conf
View File

@ -14,9 +14,6 @@
# See https://rspamd.com/doc/tutorials/writing_rules.html for details
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;
@ -168,4 +165,8 @@ rbl {
}
}
.include(try=true,priority=5) "${DBDIR}/dynamic/rbl.conf"
.include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/rbl.conf"
.include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/rbl.conf"
}

5
conf/modules.d/regexp.conf
View File

@ -14,8 +14,9 @@
# See https://rspamd.com/doc/tutorials/writing_rules.html for details
regexp {
max_size = 1M;
.include(try=true,priority=5) "${DBDIR}/dynamic/regexp.conf"
.include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/regexp.conf"
.include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/regexp.conf"
.include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/regexp.conf"
max_size = 1M;
}

7
conf/modules.d/rspamd_update.conf
View File

@ -14,9 +14,10 @@
# See https://rspamd.com/doc/tutorials/writing_rules.html for details
rspamd_update {
.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";
.include(try=true,priority=5) "${DBDIR}/dynamic/rspamd_update.conf"
.include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/rspamd_update.conf"
.include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/rspamd_update.conf"
}

7
conf/modules.d/spf.conf
View File

@ -14,9 +14,10 @@
# See https://rspamd.com/doc/tutorials/writing_rules.html for details
spf {
.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;
.include(try=true,priority=5) "${DBDIR}/dynamic/spf.conf"
.include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/spf.conf"
.include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/spf.conf"
}

7
conf/modules.d/surbl.conf
View File

@ -14,9 +14,6 @@
# See https://rspamd.com/doc/tutorials/writing_rules.html for details
surbl {
.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";
@ -98,4 +95,8 @@ surbl {
}
no_ip = true;
}
.include(try=true,priority=5) "${DBDIR}/dynamic/surbl.conf"
.include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/surbl.conf"
.include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/surbl.conf"
}

7
conf/modules.d/whitelist.conf
View File

@ -14,9 +14,6 @@
# See https://rspamd.com/doc/tutorials/writing_rules.html for details
whitelist {
.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;
@ -45,4 +42,8 @@ whitelist {
description = "Mail comes from the whitelisted domain and has valid DMARC and DKIM policies";
}
}
.include(try=true,priority=5) "${DBDIR}/dynamic/whitelist.conf"
.include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/whitelist.conf"
.include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/whitelist.conf"
}

8
conf/rspamd.systemd.conf
View File

@ -19,7 +19,7 @@
options {
.include "$CONFDIR/options.inc"
.include(try=true; priority=1) "$LOCAL_CONFDIR/local.d/options.inc"
.include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/options.inc"
.include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/options.inc"
}
@ -27,20 +27,20 @@ logging {
type = "console";
systemd = true;
.include "$CONFDIR/logging.inc"
.include(try=true; priority=1) "$LOCAL_CONFDIR/local.d/logging.inc"
.include(try=true; priority=1,duplicate=merge) "$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) "$LOCAL_CONFDIR/local.d/worker-normal.inc"
.include(try=true; priority=1,duplicate=merge) "$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) "$LOCAL_CONFDIR/local.d/worker-controller.inc"
.include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-controller.inc"
.include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-controller.inc"
}

10
conf/rspamd.sysvinit.conf
View File

@ -20,7 +20,7 @@
options {
pidfile = "$RUNDIR/rspamd.pid";
.include "$CONFDIR/options.inc"
.include(try=true; priority=1) "$LOCAL_CONFDIR/local.d/options.inc"
.include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/options.inc"
.include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/options.inc"
}
@ -28,21 +28,21 @@ logging {
type = "file";
filename = "$LOGDIR/rspamd.log";
.include "$CONFDIR/logging.inc"
.include(try=true; priority=1) "$LOCAL_CONFDIR/local.d/logging.inc"
.include(try=true; priority=1,duplicate=merge) "$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) "$LOCAL_CONFDIR/local.d/worker-normal.inc"
.include(try=true; priority=1,duplicate=merge) "$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) "$LOCAL_CONFDIR/local.d/worker-controller.inc"
.include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-controller.inc"
.include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-controller.inc"
}
@ -51,6 +51,6 @@ worker {
#worker {
# bind_socket = "*:11335";
# .include "$CONFDIR/worker-fuzzy.inc"
# .include(try=true; priority=1) "$LOCAL_CONFDIR/local.d/worker-fuzzy.inc"
# .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-fuzzy.inc"
# .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-fuzzy.inc"
#}
Write Preview
Loading…
Cancel
Save