X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Feximconf.erb;h=cdd7f9baeff182fe9b2f1b50aa6025d033fa0283;hb=95eab19f797ba51c063f207d471763918b7f3e1e;hp=b2732623df6ab0f6d616bd95055577d5145a5d53;hpb=7a1f45cf027a1459319e73f486983bbcbf51772b;p=mirror%2Fdsa-puppet.git diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb index b2732623d..cdd7f9bae 100644 --- a/modules/exim/templates/eximconf.erb +++ b/modules/exim/templates/eximconf.erb @@ -243,7 +243,7 @@ pipelining_advertise_hosts = !* tls_advertise_hosts = * smtp_enforce_sync = true -log_selector = +tls_cipher +tls_peerdn +queue_time +deliver_time +smtp_connection +smtp_incomplete_transaction +smtp_confirmation +log_selector = +tls_cipher +tls_peerdn +queue_time +deliver_time +smtp_connection +smtp_incomplete_transaction +smtp_confirmation +smtp_protocol_error 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}}}}\ @@ -917,7 +917,7 @@ check_message: <%- end -%> <%- if @is_packagesqamaster -%> - deny !hosts = +debianhosts : 5.153.231.21 + deny !hosts = +debianhosts condition = ${if eq {$acl_m_prf}{PTSMail}} condition = ${if def:h_X-PTS-Approved:{false}{true}} message = messages to the PTS require an X-PTS-Approved header