X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/71df4ba66dfa78d3d4856fc650af20001aeb09e9..f8522ae63e215cb38601a99058fca2b625efa35a:/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 d1c3ccfb3..3558af884 100644 --- a/cookbooks/exim/templates/default/exim4.conf.erb +++ b/cookbooks/exim/templates/default/exim4.conf.erb @@ -382,16 +382,6 @@ begin acl # SMTP message. acl_check_mail: -<% if node[:exim][:smarthost_name] -%> - - # Reject mail that fails SPF checks - - deny spf = fail - message = $sender_host_address is not allowed to send mail from \ - ${if def:sender_address_domain \ - {$sender_address_domain}{$sender_helo_name}}. - !hosts = +relay_from_hosts -<% end -%> accept @@ -763,6 +753,9 @@ signed_smtp: multi_domain = false hosts_try_dane = tls_require_ciphers = <%= node[:ssl][:gnutls_ciphers] %>:%LATEST_RECORD_VERSION +<% if node[:exim][:external_interface] -%> + interface = <%= node[:exim][:external_interface] %> +<% end -%> # This transport is used for handling pipe deliveries generated by alias or