From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 17 Jun 2016 08:17:52 +0000 (+0100)
Subject: [Minor] Add merge strategy for local metric configuration
X-Git-Tag: 1.3.0~310
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ca2d1a294724d8447ccb95e8f687a41cd809752;p=thirdparty%2Frspamd.git

[Minor] Add merge strategy for local metric configuration
---

diff --git a/conf/metrics.conf b/conf/metrics.conf
index aa4dab0226..17c060d189 100644
--- a/conf/metrics.conf
+++ b/conf/metrics.conf
@@ -1028,6 +1028,6 @@ metric {
         }
     }
 
-    .include(try=true; priority=1) "$LOCAL_CONFDIR/local.d/metrics.conf"
+    .include(try=true; priority=1; duplicate=merge) "$LOCAL_CONFDIR/local.d/metrics.conf"
     .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/metrics.conf"
 }