From 115c6540e2baddce97ec5c9b876f05f9250b1c7f Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Wed, 3 Jun 2020 08:34:15 +0200
Subject: [PATCH] [Rspamd] Consistent LOCAL_CONFDIR

---
 data/conf/rspamd/local.d/multimap.conf | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/data/conf/rspamd/local.d/multimap.conf b/data/conf/rspamd/local.d/multimap.conf
index c3388b2f..180e82ee 100644
--- a/data/conf/rspamd/local.d/multimap.conf
+++ b/data/conf/rspamd/local.d/multimap.conf
@@ -27,7 +27,7 @@ WHITELISTED_FWD_HOST {
 
 BULK_HEADER {
   type = "content";
-  map = "$LOCAL_CONFDIR/custom/bulk_header.map";
+  map = "${LOCAL_CONFDIR}/custom/bulk_header.map";
   filter = "headers"
   regexp = true;
   symbols_set = ["BULK_HEADER"];
@@ -36,7 +36,7 @@ BULK_HEADER {
 LOCAL_BL_ASN {
   require_symbols = "!MAILCOW_WHITE";
   type = "asn";
-  map = "$LOCAL_CONFDIR/custom/bad_asn.map";
+  map = "${LOCAL_CONFDIR}/custom/bad_asn.map";
   score = 5;
   description = "Sender's ASN is on the local blacklist";
   symbols_set = ["LOCAL_BL_ASN"];
@@ -44,7 +44,7 @@ LOCAL_BL_ASN {
 
 GLOBAL_SMTP_FROM_WL {
   type = "from";
-  map = "$LOCAL_CONFDIR/custom/global_smtp_from_whitelist.map";
+  map = "${LOCAL_CONFDIR}/custom/global_smtp_from_whitelist.map";
   regexp = true;
   prefilter = true;
   action = "accept";
@@ -52,7 +52,7 @@ GLOBAL_SMTP_FROM_WL {
 
 GLOBAL_SMTP_FROM_BL {
   type = "from";
-  map = "$LOCAL_CONFDIR/custom/global_smtp_from_blacklist.map";
+  map = "${LOCAL_CONFDIR}/custom/global_smtp_from_blacklist.map";
   regexp = true;
   prefilter = true;
   action = "reject";
@@ -61,7 +61,7 @@ GLOBAL_SMTP_FROM_BL {
 GLOBAL_MIME_FROM_WL {
   type = "header";
   header = "from";
-  map = "$LOCAL_CONFDIR/custom/global_mime_from_whitelist.map";
+  map = "${LOCAL_CONFDIR}/custom/global_mime_from_whitelist.map";
   regexp = true;
   prefilter = true;
   action = "accept";
@@ -70,7 +70,7 @@ GLOBAL_MIME_FROM_WL {
 GLOBAL_MIME_FROM_BL {
   type = "header";
   header = "from";
-  map = "$LOCAL_CONFDIR/custom/global_mime_from_blacklist.map";
+  map = "${LOCAL_CONFDIR}/custom/global_mime_from_blacklist.map";
   regexp = true;
   prefilter = true;
   action = "reject";
@@ -78,7 +78,7 @@ GLOBAL_MIME_FROM_BL {
 
 GLOBAL_RCPT_WL {
   type = "rcpt";
-  map = "$LOCAL_CONFDIR/custom/global_rcpt_whitelist.map";
+  map = "${LOCAL_CONFDIR}/custom/global_rcpt_whitelist.map";
   regexp = true;
   prefilter = true;
   action = "accept";
@@ -86,7 +86,7 @@ GLOBAL_RCPT_WL {
 
 GLOBAL_RCPT_BL {
   type = "rcpt";
-  map = "$LOCAL_CONFDIR/custom/global_rcpt_blacklist.map";
+  map = "${LOCAL_CONFDIR}/custom/global_rcpt_blacklist.map";
   regexp = true;
   prefilter = true;
   action = "reject";
@@ -94,14 +94,14 @@ GLOBAL_RCPT_BL {
 
 SIEVE_HOST {
   type = "ip";
-  map = "$LOCAL_CONFDIR/custom/dovecot_trusted.map";
+  map = "${LOCAL_CONFDIR}/custom/dovecot_trusted.map";
   symbols_set = ["SIEVE_HOST"];
   score = -15;
 }
 
 RSPAMD_HOST {
   type = "ip";
-  map = "$LOCAL_CONFDIR/custom/rspamd_trusted.map";
+  map = "${LOCAL_CONFDIR}/custom/rspamd_trusted.map";
   symbols_set = ["RSPAMD_HOST"];
 }
 
@@ -114,7 +114,7 @@ MAILCOW_DOMAIN_HEADER_FROM {
 
 IP_WHITELIST {
   type = "ip";
-  map = "$LOCAL_CONFDIR/custom/ip_wl.map";
+  map = "${LOCAL_CONFDIR}/custom/ip_wl.map";
   symbols_set = ["IP_WHITELIST"];
   score = -100;
 }