Upgrade everything except ridley and ouroboros to chef 12

[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 3b33facf7fd5941edc1562b8d2f2f191b72dd018..f81fe50512a178eb54dcc53d59d19ad65fef2567 100644 (file)
--- a/cookbooks/exim/templates/default/exim4.conf.erb
+++ b/cookbooks/exim/templates/default/exim4.conf.erb
@@ -371,7 +371,7 @@ acl_check_rcpt:
 
   deny    message       = Restricted characters in address
           domains       = !+local_domains
 
   deny    message       = Restricted characters in address
           domains       = !+local_domains

-          local_parts   = ^[./|] : ^.*[@%!] : ^.*/\\.\\./
+          local_parts   = ^[./|] : ^.*[@!] : ^.*/\\.\\./

   #############################################################################
 
   # Accept mail to postmaster in any local domain, regardless of the source,
   #############################################################################
 
   # Accept mail to postmaster in any local domain, regardless of the source,


@@ -385,10 +385,6 @@ acl_check_rcpt:
   deny   !hosts         = +relay_from_hosts
          !verify        = sender
 
   deny   !hosts         = +relay_from_hosts
          !verify        = sender
 

-  deny   !hosts         = +relay_from_hosts
-         !senders       = lsearch*@;/etc/exim4/callout_exempt_senders
-         !verify        = sender/callout/defer_ok
-

   # Accept if the message comes from one of the hosts for which we are an
   # outgoing relay. It is assumed that such hosts are most likely to be MUAs,
   # so we set control=submission to make Exim treat the message as a
   # Accept if the message comes from one of the hosts for which we are an
   # outgoing relay. It is assumed that such hosts are most likely to be MUAs,
   # so we set control=submission to make Exim treat the message as a


@@ -529,7 +525,7 @@ begin routers
 
 system_aliases:
   driver = redirect
 
 system_aliases:
   driver = redirect

-  domains = +local_domains
+  domains = !noreply.openstreetmap.org : +local_domains

   allow_fail
   allow_defer
   data = ${lookup{$local_part}lsearch{/etc/aliases}}
   allow_fail
   allow_defer
   data = ${lookup{$local_part}lsearch{/etc/aliases}}


@@ -575,6 +571,8 @@ noreply:
 <% end -%>
 <% if details[:local_parts] -%>
   local_parts = <%= details[:local_parts].join(" : ") %>
 <% end -%>
 <% if details[:local_parts] -%>
   local_parts = <%= details[:local_parts].join(" : ") %>

+  local_part_suffix = +*
+  local_part_suffix_optional

 <% end -%>
 <% if details[:host] -%>
 <% if details[:host].kind_of?(Array) -%>
 <% end -%>
 <% if details[:host] -%>
 <% if details[:host].kind_of?(Array) -%>


@@ -697,19 +695,31 @@ noreply:
   group = Debian-exim
 
 <% node[:exim][:routes].each do |name,details| -%>
   group = Debian-exim
 
 <% node[:exim][:routes].each do |name,details| -%>

-<% if details[:command] -%>
+<% if details[:command] or details[:file] or details[:maildir] -%>

 # This transport handles mail for <%= details[:comment] -%>.
 
 <%= name -%>:
 # This transport handles mail for <%= details[:comment] -%>.
 
 <%= name -%>:

+<% if details[:command] -%>

   driver = pipe
   command = <%= details[:command] %>
   driver = pipe
   command = <%= details[:command] %>

+  home_directory = <%= details[:home_directory] %>
+  return_output
+<% else -%>
+  driver = appendfile
+<% if details[:file] -%>
+  file = <%= details[:file] %>
+<% elsif details[:maildir] -%>
+  directory = <%= details[:maildir] %>
+  maildir_format
+<% end -%>
+  envelope_to_add
+  return_path_add
+  mode = 0660
+<% end -%>

   user = <%= details[:user] %>
 <% if details[:group] -%>
   group = <%= details[:group] %>
 <% end -%>
   user = <%= details[:user] %>
 <% if details[:group] -%>
   group = <%= details[:group] %>
 <% end -%>

-  home_directory = <%= details[:home_directory] %>
-  return_output
-

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


@@ -746,6 +756,9 @@ begin retry
 # There are no rewriting specifications in this default configuration file.
 
 begin rewrite
 # There are no rewriting specifications in this default configuration file.
 
 begin rewrite

+<% node[:exim][:rewrites].each do |rewrite| -%>
+<%= rewrite[:pattern] %> <%= rewrite[:replacement] %> <%= rewrite[:flags] %>
+<% end -%>