Update chef client to 17.10.3

[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 2d1d96e1288751dac4ed8ae2073abe63f089dc9f..0830aa141f1d5a18a7c971fd4f9973caf731a3ef 100644 (file)
--- a/cookbooks/exim/templates/default/exim4.conf.erb
+++ b/cookbooks/exim/templates/default/exim4.conf.erb
@@ -364,6 +364,11 @@ queue_only = true
 queue_run_max = <%= node[:exim][:queue_run_max] %>
 
 
 queue_run_max = <%= node[:exim][:queue_run_max] %>
 
 

+# Maximum number of simultaneous SMTP connections
+
+smtp_accept_max = <%= node[:exim][:smtp_accept_max] %>
+
+

 
 ######################################################################
 #                       ACL CONFIGURATION                            #
 
 ######################################################################
 #                       ACL CONFIGURATION                            #


@@ -720,6 +725,7 @@ remote_smtp:
 
 signed_smtp:
   driver = 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}
   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}


@@ -779,7 +785,7 @@ noreply:
   to = $sender_address
   subject = Re: $header_subject:
   headers = MIME-Version: 1.0\nContent-Type: text/plain; charset=utf-8
   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
 
   user = Debian-exim
   group = Debian-exim