Use backport of cgi-mapserver

[chef.git] / 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 6babb839a208c80fe1975e23c9f737ecae420f15..ffc8be609f4d9f2f360cd37dd9015a063db908ee 100644 (file)
--- 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:
 
 # 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
 
 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
 
 
 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.
 # 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.


@@ -506,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.
 
   # 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.
 
 <% if node[:exim][:dns_blacklists] -%>
   # Deny any messages from hosts in certain blacklists.


@@ -666,6 +678,9 @@ noreply:
 <% else -%>
   transport = <%= name %>
 <% end -%>
 <% else -%>
   transport = <%= name %>
 <% end -%>

+<% if details[:case_sensitive] -%>
+  caseful_local_part
+<% end -%>

 
 <% end -%>
 
 
 <% end -%>