summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpacien2019-04-15 09:57:48 +0200
committerpacien2019-04-15 09:57:48 +0200
commita2e9e4e2f81a27300d9bf81264176f539f4a2d57 (patch)
tree6a44a049ef6c61ee98368c05eea9c3613f8cdb08
parentc13b5dd6956cf092f5b674b090e0f7c8c2a3ff4c (diff)
downloadexim-a2e9e4e2f81a27300d9bf81264176f539f4a2d57.tar.gz
do not sign if dkim key is missing
-rw-r--r--conf.d/040_transports.conf4
1 files changed, 3 insertions, 1 deletions
diff --git a/conf.d/040_transports.conf b/conf.d/040_transports.conf
index 5a829fb..543671f 100644
--- a/conf.d/040_transports.conf
+++ b/conf.d/040_transports.conf
@@ -33,12 +33,14 @@ DKIM_SIGN_HEADERS = _DKIM_SIGN_HEADERS
33DKIM_SIGN_HEADERS = In-Reply-To:Content-Transfer-Encoding:Content-Type:MIME-Version:References:Message-ID:Subject:To:From:Date:Sender:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive 33DKIM_SIGN_HEADERS = In-Reply-To:Content-Transfer-Encoding:Content-Type:MIME-Version:References:Message-ID:Subject:To:From:Date:Sender:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
34.endif 34.endif
35 35
36DKIM_PRIVATE_KEY_FILE = DKIMDIR/$dkim_selector._domainkey.$dkim_domain.pem
37
36signed_smtp: 38signed_smtp:
37 driver = smtp 39 driver = smtp
38 message_size_limit = ${if > {$max_received_linelength}{998} {1}{0}} 40 message_size_limit = ${if > {$max_received_linelength}{998} {1}{0}}
39 dkim_domain = ${if def:authenticated_id {$sender_address_domain}} 41 dkim_domain = ${if def:authenticated_id {$sender_address_domain}}
40 dkim_selector = $primary_hostname 42 dkim_selector = $primary_hostname
41 dkim_private_key = DKIMDIR/$dkim_selector._domainkey.$dkim_domain.pem 43 dkim_private_key = ${if exists{DKIM_PRIVATE_KEY_FILE}{DKIM_PRIVATE_KEY_FILE}{0}}
42 dkim_canon = relaxed 44 dkim_canon = relaxed
43 dkim_strict = yes 45 dkim_strict = yes
44 dkim_sign_headers = ${filter{DKIM_SIGN_HEADERS}{!eq{$item}{Sender}}} 46 dkim_sign_headers = ${filter{DKIM_SIGN_HEADERS}{!eq{$item}{Sender}}}