X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ab1a3d0ec7a1fef91813287180a84b73b86e5881..e92ed5e09215d67f2bd7dc21a32425d7ec5aa26f:/cookbooks/exim/templates/default/exim4.conf.erb diff --git a/cookbooks/exim/templates/default/exim4.conf.erb b/cookbooks/exim/templates/default/exim4.conf.erb index 7b0afac41..ffc8be609 100644 --- a/cookbooks/exim/templates/default/exim4.conf.erb +++ b/cookbooks/exim/templates/default/exim4.conf.erb @@ -107,6 +107,7 @@ hostlist relay_from_hosts = <; <%= @relay_from_hosts.join(" ; ") %> # manual for details. The lists above are used in the access control lists for # checking incoming messages. The names of these ACLs are defined here: +acl_smtp_mail = acl_check_mail acl_smtp_rcpt = acl_check_rcpt acl_smtp_data = acl_check_data @@ -377,6 +378,13 @@ smtp_accept_max = <%= node[:exim][:smtp_accept_max] %> begin acl +# This access control list is used for the MAIL command in an incoming +# SMTP message. + +acl_check_mail: + + accept + # This access control list is used for every RCPT command in an incoming # SMTP message. The tests are run in order until the address is either # accepted or denied. @@ -446,6 +454,10 @@ acl_check_rcpt: message = Rejected because $sender_address is blacklisted\nQueries to postmaster@$qualify_domain !hosts = +relay_from_hosts + deny sender_domains= partial-lsearch;/etc/exim4/blocked-sender-domains + message = Rejected because $sender_address is blacklisted\nQueries to postmaster@$qualify_domain + !hosts = +relay_from_hosts + # Accept mail to postmaster in any local domain, regardless of the source, # and without verifying the sender. @@ -502,7 +514,11 @@ acl_check_rcpt: # relay domains is to use a callout (add /callout), but please read the # documentation about callouts before doing this. - require verify = recipient + deny domains = +relay_to_domains + !verify = recipient/callout=use_sender + + deny domains = !+relay_to_domains + !verify = recipient <% if node[:exim][:dns_blacklists] -%> # Deny any messages from hosts in certain blacklists. @@ -662,6 +678,9 @@ noreply: <% else -%> transport = <%= name %> <% end -%> +<% if details[:case_sensitive] -%> + caseful_local_part +<% end -%> <% end -%> @@ -725,6 +744,7 @@ 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} @@ -784,7 +804,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