From: Alexander Moisseev <moiseev@mezonplus.ru>
Date: Fri, 1 Jul 2016 07:53:57 +0000 (+0300)
Subject: [Conf] Allow easy adding composites
X-Git-Tag: 1.3.0~203^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F692%2Fhead;p=rspamd.git

[Conf] Allow easy adding composites
---

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"