X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/4dfa85adc113c5679167960dd8ad61da5b348dad..5f3a5421476c68027c50b821916585ab01f0efa1:/cookbooks/exim/templates/default/exim4.conf.erb?ds=inline diff --git a/cookbooks/exim/templates/default/exim4.conf.erb b/cookbooks/exim/templates/default/exim4.conf.erb index 17160ecf3..0830aa141 100644 --- a/cookbooks/exim/templates/default/exim4.conf.erb +++ b/cookbooks/exim/templates/default/exim4.conf.erb @@ -358,6 +358,17 @@ timeout_frozen_after = 7d trusted_users = <%= node[:exim][:trusted_users].join(" : ") %> +# Do all deliveries via a limited set of queues. + +queue_only = true +queue_run_max = <%= node[:exim][:queue_run_max] %> + + +# Maximum number of simultaneous SMTP connections + +smtp_accept_max = <%= node[:exim][:smtp_accept_max] %> + + ###################################################################### # ACL CONFIGURATION # @@ -550,9 +561,13 @@ acl_check_data: !hosts = +relay_from_hosts message = This message failed local spam checks. - # Accept the message. + # Accept messages from relay hosts without modification. - accept + accept hosts = +relay_from_hosts + + # Accept messages from external hosts and add authentication results. + + accept add_header = :at_start:${authresults {$primary_hostname}} @@ -710,12 +725,14 @@ remote_smtp: signed_smtp: driver = smtp + connect_timeout = 1m dkim_domain = ${lookup{${domain:$h_from:}}partial-lsearch{/etc/exim4/dkim-domains}{$value}} dkim_selector = ${lookup{$dkim_domain}lsearch{/etc/exim4/dkim-selectors}{$value}} dkim_private_key = /etc/exim4/dkim-keys/${dkim_domain} dkim_identity = ${lc:${address:$h_from:}} - # dkim_timestamps = 1209600 + dkim_timestamps = 1209600 multi_domain = false + hosts_try_dane = tls_require_ciphers = <%= node[:ssl][:gnutls_ciphers] %>:%LATEST_RECORD_VERSION @@ -768,7 +785,7 @@ noreply: to = $sender_address subject = Re: $header_subject: headers = MIME-Version: 1.0\nContent-Type: text/plain; charset=utf-8 - file = /etc/exim4/noreply/$local_part_data + file = ${lookup{$local_part}dsearch,filter=file,ret=full{/etc/exim4/noreply}} user = Debian-exim group = Debian-exim