From: Tom Hughes <tom@compton.nu>
Date: Wed, 10 Nov 2021 20:45:26 +0000 (+0000)
Subject: Increase maximum number of SMTP connections on shenron
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/ab1a3d0ec7a1fef91813287180a84b73b86e5881?ds=sidebyside

Increase maximum number of SMTP connections on shenron
---

diff --git a/cookbooks/exim/attributes/default.rb b/cookbooks/exim/attributes/default.rb
index 21e999109..638ce5765 100644
--- 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][:smtp_accept_max] = 20
 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 2d1d96e12..7b0afac41 100644
--- 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] %>
 
 
+# Maximum number of simultaneous SMTP connections
+
+smtp_accept_max = <%= node[:exim][:smtp_accept_max] %>
+
+
 
 ######################################################################
 #                       ACL CONFIGURATION                            #
diff --git a/roles/mail.rb b/roles/mail.rb
index 77b3bf3f4..50382b03b 100644
--- a/roles/mail.rb
+++ b/roles/mail.rb
@@ -27,6 +27,7 @@ default_attributes(
       "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"],