summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpacien2019-05-29 14:43:56 +0200
committerpacien2019-05-29 14:43:56 +0200
commitefaa976550e2de2e6e59e25f179aedf42d9ea1b3 (patch)
treece7555466543277183c4ba9f8ab5cd43cd567fe3
parenta2e9e4e2f81a27300d9bf81264176f539f4a2d57 (diff)
downloadexim-efaa976550e2de2e6e59e25f179aedf42d9ea1b3.tar.gz
parameterise spf query command
-rw-r--r--conf.d/020_acl.conf2
-rw-r--r--exim.conf1
2 files changed, 2 insertions, 1 deletions
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:
50 set acl_m_msg = Rejected: $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text 50 set acl_m_msg = Rejected: $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text
51 51
52 # Accept if the host is an authorized sender according to the SPF policy for the domain (SPF pass). 52 # Accept if the host is an authorized sender according to the SPF policy for the domain (SPF pass).
53 accept set acl_m_spf = ${run{/usr/bin/spfquery.mail-spf-perl \ 53 accept set acl_m_spf = ${run{SPF_QUERY_COMMAND \
54 --ip ${quote:$sender_host_address} \ 54 --ip ${quote:$sender_host_address} \
55 --identity ${if def:sender_address_domain \ 55 --identity ${if def:sender_address_domain \
56 {--scope mfrom --identity ${quote:$sender_address}} \ 56 {--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
44USERLIST = /etc/mail/list.d/users.list 44USERLIST = /etc/mail/list.d/users.list
45#ENABLE_PAM_AUTH = yes 45#ENABLE_PAM_AUTH = yes
46#DOVECOT_AUTH_SOCKET = /var/run/dovecot/auth-client 46#DOVECOT_AUTH_SOCKET = /var/run/dovecot/auth-client
47SPF_QUERY_COMMAND = /usr/bin/spfquery.mail-spf-perl
47 48
48ALIASMAP = /etc/mail/list.d/aliases.map 49ALIASMAP = /etc/mail/list.d/aliases.map
49 50