From efaa976550e2de2e6e59e25f179aedf42d9ea1b3 Mon Sep 17 00:00:00 2001
From: pacien
Date: Wed, 29 May 2019 14:43:56 +0200
Subject: parameterise spf query command

---
 conf.d/020_acl.conf | 2 +-
 exim.conf           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/conf.d/020_acl.conf b/conf.d/020_acl.conf
index 956a53d..21889a9 100644
--- a/conf.d/020_acl.conf
+++ b/conf.d/020_acl.conf
@@ -50,7 +50,7 @@ acl_check_rcpt_host_policy:
            set acl_m_msg = Rejected: $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text
 
   # Accept if the host is an authorized sender according to the SPF policy for the domain (SPF pass).
-  accept   set acl_m_spf = ${run{/usr/bin/spfquery.mail-spf-perl \
+  accept   set acl_m_spf = ${run{SPF_QUERY_COMMAND \
                              --ip ${quote:$sender_host_address} \
                              --identity ${if def:sender_address_domain \
                                {--scope mfrom --identity ${quote:$sender_address}} \
diff --git a/exim.conf b/exim.conf
index 9c0b1a4..eedf5a8 100644
--- a/exim.conf
+++ b/exim.conf
@@ -44,6 +44,7 @@ DKIMDIR = /etc/mail/dkim
 USERLIST = /etc/mail/list.d/users.list
 #ENABLE_PAM_AUTH = yes
 #DOVECOT_AUTH_SOCKET = /var/run/dovecot/auth-client
+SPF_QUERY_COMMAND = /usr/bin/spfquery.mail-spf-perl
 
 ALIASMAP = /etc/mail/list.d/aliases.map
 
-- 
cgit v1.2.3