From: Stephen Gran Date: Thu, 30 Apr 2009 20:12:33 +0000 (+0100) Subject: Oh yes, line wrap markers X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=4d75b2db79978fa0592442ea11ff9a6843e527a8;p=mirror%2Fdsa-puppet.git Oh yes, line wrap markers Signed-off-by: Stephen Gran --- diff --git a/modules/exim/files/common/exim4.conf b/modules/exim/files/common/exim4.conf index 3ffc39c79..4b048612e 100644 --- a/modules/exim/files/common/exim4.conf +++ b/modules/exim/files/common/exim4.conf @@ -216,12 +216,12 @@ smtp_enforce_sync = true log_selector = +tls_cipher +tls_peerdn +queue_time +deliver_time +smtp_connection +smtp_incomplete_transaction +smtp_confirmation -received_header_text = Received: ${if def:sender_rcvhost {from $sender_rcvhost\n\t} - {${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)\n\t}}}} - ${if and {{eq {$tls_certificate_verified}{1}}{def:tls_peerdn}}{from $tls_peerdn\n\t}} - by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher)\n\t}} - (Exim $version_number)\n\t - ${if def:sender_address {(envelope-from <$sender_address>)\n\t}} +received_header_text = Received: ${if def:sender_rcvhost {from $sender_rcvhost\n\t}\ + {${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)\n\t}}}}\ + ${if and {{eq {$tls_certificate_verified}{1}}{def:tls_peerdn}}{from $tls_peerdn\n\t}}\ + by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher)\n\t}}\ + (Exim $version_number)\n\t\ + ${if def:sender_address {(envelope-from <$sender_address>)\n\t}}\ id $message_exim_id${if def:received_for {\n\tfor $received_for}} # macro definitions.