Merge pull request #3045 from moisseev/conf

[Conf] Add path to greylist-whitelist-domains.inc
rspamd · Sep 20, 2019 · 4518485 · 4518485
2 parents 8597962 + b03e54c
commit 4518485
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/conf/modules.d/greylist.conf b/conf/modules.d/greylist.conf
@@ -17,6 +17,7 @@ greylist {
   # Search "example.com" and "mail.example.com" for "mx.out.mail.example.com":
   whitelist_domains_url = [
     "$LOCAL_CONFDIR/local.d/greylist-whitelist-domains.inc",
+    "$LOCAL_CONFDIR/local.d/maps.d/greylist-whitelist-domains.inc",
   ];
 
   expire = 1d; # 1 day by default

diff --git a/src/plugins/lua/greylist.lua b/src/plugins/lua/greylist.lua
@@ -20,7 +20,7 @@ Example domains whitelist config:
 greylist {
   # Search "example.com" and "mail.example.com" for "mx.out.mail.example.com":
   whitelist_domains_url = [
-    "$LOCAL_CONFDIR/local.d/greylist-whitelist-domains.inc",
+    "$LOCAL_CONFDIR/local.d/maps.d/greylist-whitelist-domains.inc",
     "${CONFDIR}/maps.d/maillist.inc",
     "${CONFDIR}/maps.d/redirectors.inc",
     "${CONFDIR}/maps.d/dmarc_whitelist.inc",