]> git.openstreetmap.org Git - chef.git/blobdiff - cookbooks/exim/templates/default/exim4.conf.erb
add city of melbourne imagery
[chef.git] / cookbooks / exim / templates / default / exim4.conf.erb
index d1c3ccfb353f35ec6f704b4229a0b39e3b43de24..3558af884317b3907656de655d1b105ad2d9a2d4 100644 (file)
@@ -382,16 +382,6 @@ begin acl
 # SMTP message.
 
 acl_check_mail:
 # 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
 
 
   accept
 
@@ -763,6 +753,9 @@ signed_smtp:
   multi_domain = false
   hosts_try_dane =
   tls_require_ciphers = <%= node[:ssl][:gnutls_ciphers] %>:%LATEST_RECORD_VERSION
   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
 
 
 # This transport is used for handling pipe deliveries generated by alias or