From: Andrew Lewis <nerf@judo.za.org>
Date: Thu, 9 Mar 2017 08:45:15 +0000 (+0200)
Subject: [Minor] Fix non-conformant config file
X-Git-Tag: 1.5.3~73^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F1504%2Fhead;p=rspamd.git

[Minor] Fix non-conformant config file
---

diff --git a/conf/modules.d/dmarc.conf b/conf/modules.d/dmarc.conf
index 75d9342a9..2944a2dcb 100644
--- a/conf/modules.d/dmarc.conf
+++ b/conf/modules.d/dmarc.conf
@@ -15,6 +15,6 @@
 
 dmarc {
     .include(try=true,priority=5) "${DBDIR}/dynamic/dmarc.conf"
-    .include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/dmarc.conf"
+    .include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/dmarc.conf"
     .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/dmarc.conf"
 }