From db4da2c22d159d1a6450b9447ad90e1795e5c535 Mon Sep 17 00:00:00 2001
From: Andrew Lewis <nerf@judo.za.org>
Date: Tue, 4 May 2021 13:48:37 +0200
Subject: [Test] Use lupa for templating rspamd configs

---
 test/functional/configs/whitelist.conf | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'test/functional/configs/whitelist.conf')

diff --git a/test/functional/configs/whitelist.conf b/test/functional/configs/whitelist.conf
index d7592fc35..db264aa42 100644
--- a/test/functional/configs/whitelist.conf
+++ b/test/functional/configs/whitelist.conf
@@ -1,3 +1,5 @@
+.include(duplicate=append,priority=0) "{= env.TESTDIR =}/configs/plugins.conf"
+
 dmarc {}
 spf {}
 whitelist {
@@ -9,7 +11,7 @@ whitelist {
             valid_dmarc = true;
             valid_spf = true;
             domains = [
-                "${TESTDIR}/configs/maps/domains.list",
+                "{= env.TESTDIR =}/configs/maps/domains.list",
             ];
             score = -3.0;
             inverse_symbol = "BLACKLIST_DDS";
@@ -18,7 +20,7 @@ whitelist {
         "WHITELIST_DKIM" = {
             valid_dkim = true;
             domains = [
-                "${TESTDIR}/configs/maps/domains.list",
+                "{= env.TESTDIR =}/configs/maps/domains.list",
             ];
             description = "Mail comes from the whitelisted domain and has a valid DKIM signature";
             score = -1.0;
@@ -28,7 +30,7 @@ whitelist {
         "WHITELIST_SPF" = {
             valid_spf = true;
             domains = [
-                "${TESTDIR}/configs/maps/domains.list",
+                "{= env.TESTDIR =}/configs/maps/domains.list",
             ];
             score = -1.0
             inverse_multiplier = 3.0
@@ -40,7 +42,7 @@ whitelist {
             valid_spf = true;
             valid_dkim = true;
             domains = [
-                "${TESTDIR}/configs/maps/domains.list"
+                "{= env.TESTDIR =}/configs/maps/domains.list"
             ];
             score = -3.0;
             description = "Mail comes from the whitelisted domain and has a valid SPF policy and valid DKIM signature";
@@ -51,7 +53,7 @@ whitelist {
             valid_dmarc = true;
             valid_dkim = true;
             domains = [
-                "${TESTDIR}/configs/maps/domains.list",
+                "{= env.TESTDIR =}/configs/maps/domains.list",
             ];
             score = -2.0;
             description = "Mail comes from the whitelisted domain and has valid DMARC and DKIM policies";
@@ -61,7 +63,7 @@ whitelist {
         "WHITELIST_DMARC" = {
             valid_dmarc = true;
             domains = [
-                "${TESTDIR}/configs/maps/domains.list",
+                "{= env.TESTDIR =}/configs/maps/domains.list",
             ];
             score = -2.0;
             description = "Mail comes from the whitelisted domain and has valid DMARC policy";
@@ -72,7 +74,7 @@ whitelist {
             strict = true;
             valid_dmarc = true;
             domains = [
-                "${TESTDIR}/configs/maps/domains.list",
+                "{= env.TESTDIR =}/configs/maps/domains.list",
             ];
             score = -3.0;
         }
-- 
cgit v1.2.3