Increase maximum number of SMTP connections on shenron

diff --git a/cookbooks/exim/attributes/default.rb b/cookbooks/exim/attributes/default.rb
index 21e999109794dc7cb5fe7d63a8fafb33bd91e355..638ce5765b1c10ac1c5ab3285eed85ef4db91412 100644 (file)
--- a/cookbooks/exim/attributes/default.rb
+++ b/cookbooks/exim/attributes/default.rb
@@ -4,6 +4,7 @@ default[:exim][:relay_from_hosts] = ["127.0.0.1", "::1"]
 default[:exim][:daemon_smtp_ports] = [25]
 default[:exim][:trusted_users] = []
 default[:exim][:queue_run_max] = 1
 default[:exim][:daemon_smtp_ports] = [25]
 default[:exim][:trusted_users] = []
 default[:exim][:queue_run_max] = 1

+default[:exim][:smtp_accept_max] = 20

 default[:exim][:smarthost_name] = nil
 default[:exim][:smarthost_via] = "mail.openstreetmap.org:26"
 default[:exim][:routes] = {}
 default[:exim][:smarthost_name] = nil
 default[:exim][:smarthost_via] = "mail.openstreetmap.org:26"
 default[:exim][:routes] = {}

diff --git a/cookbooks/exim/templates/default/exim4.conf.erb b/cookbooks/exim/templates/default/exim4.conf.erb
index 2d1d96e1288751dac4ed8ae2073abe63f089dc9f..7b0afac410d889d77fb6e49af331ea7a51f0db4c 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                            #

diff --git a/roles/mail.rb b/roles/mail.rb
index 77b3bf3f40a860cc90a8bf932f420aafecc9bb3c..50382b03bef7562cfd9b57841612aa175a2f7491 100644 (file)
--- a/roles/mail.rb
+++ b/roles/mail.rb
@@ -27,6 +27,7 @@ default_attributes(
       "a.mx.osm.io"
     ],
     :queue_run_max => 5,
       "a.mx.osm.io"
     ],
     :queue_run_max => 5,

+    :smtp_accept_max => 200,

     :smarthost_name => "mail.openstreetmap.org",
     :smarthost_via => false,
     :dns_blacklists => ["zen.spamhaus.org"],
     :smarthost_name => "mail.openstreetmap.org",
     :smarthost_via => false,
     :dns_blacklists => ["zen.spamhaus.org"],