summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpacien2019-05-29 14:52:37 +0200
committerpacien2019-05-29 14:52:37 +0200
commit4360fa6651df3190c77ce52610f8e06db12096c5 (patch)
tree1aed366300ae278eb774bca6ddafda3ca9b5a7d5
parentefaa976550e2de2e6e59e25f179aedf42d9ea1b3 (diff)
downloadexim-4360fa6651df3190c77ce52610f8e06db12096c5.tar.gz
parameterise dig query command
-rw-r--r--conf.d/020_acl.conf2
-rw-r--r--exim.conf2
2 files changed, 3 insertions, 1 deletions
diff --git a/conf.d/020_acl.conf b/conf.d/020_acl.conf
index 21889a9..6d0b3e4 100644
--- a/conf.d/020_acl.conf
+++ b/conf.d/020_acl.conf
@@ -177,7 +177,7 @@ acl_mta_dkim:
177 deny message = [DKIM] required signature is missing. 177 deny message = [DKIM] required signature is missing.
178 dkim_status = none 178 dkim_status = none
179 condition = ${if match \ 179 condition = ${if match \
180 {${run{/usr/bin/dig +short TXT ${quote:_domainkey.$sender_host_address}}}}{/o=-/} \ 180 {${run{DIG_QUERY_COMMAND +short TXT ${quote:_domainkey.$sender_host_address}}}}{/o=-/} \
181 {yes}{no}} 181 {yes}{no}}
182 182
183 accept 183 accept
diff --git a/exim.conf b/exim.conf
index eedf5a8..678be1e 100644
--- a/exim.conf
+++ b/exim.conf
@@ -44,7 +44,9 @@ 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
47
47SPF_QUERY_COMMAND = /usr/bin/spfquery.mail-spf-perl 48SPF_QUERY_COMMAND = /usr/bin/spfquery.mail-spf-perl
49DIG_QUERY_COMMAND = /usr/bin/dig
48 50
49ALIASMAP = /etc/mail/list.d/aliases.map 51ALIASMAP = /etc/mail/list.d/aliases.map
50 52