diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2016-07-01 09:39:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-01 09:39:45 +0100 |
| commit | 27fe6a37294da7c156390dce377abfcb62224cde (patch) | |
| tree | dc232eacd1d7af578aee802c8b1a0cfaa648da95 /conf | |
| parent | 12f8569d8ace0015d0601b96c51faf2f4c55ef37 (diff) | |
| parent | 11e16bcfb5ef4dfb4e56201154a1feb7244801d1 (diff) | |
| download | rspamd-27fe6a37294da7c156390dce377abfcb62224cde.tar.gz rspamd-27fe6a37294da7c156390dce377abfcb62224cde.zip | |
Merge pull request #692 from moisseev/conf-composites
[Conf] Allow easy adding composites
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/composites.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/composites.conf b/conf/composites.conf index 5125de45c..edb5d3205 100644 --- a/conf/composites.conf +++ b/conf/composites.conf @@ -33,5 +33,5 @@ composite "RBL_SPAMHAUS_XBL_ANY" { expression = "(-RBL_SPAMHAUS_XBL | -RBL_SPAMHAUS_XBL1 | -RBL_SPAMHAUS_XBL2 | -RBL_SPAMHAUS_XBL3) & RECEIVED_SPAMHAUS_XBL"; } -.include(try=true; priority=1) "$LOCAL_CONFDIR/local.d/composites.conf" +.include(try=true; priority=1; duplicate=merge) "$LOCAL_CONFDIR/local.d/composites.conf" .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/composites.conf" |