Accept more MSA connections than normal connections

diff --git a/master b/master
index 46d6188fa047dcd31ac5820376fc6e371cfc5ab8..1417fabeea154af4b325f0333e19cf6ae9f2f64a 100644 (file)
--- a/master
+++ b/master
@@ -19,6 +19,11 @@ REMOTE_OR_VERP_SMTP = remote_smtp
 keep_environment = ^LDAP
 add_environment = PATH=/usr/bin::/bin
 
+# Allow 20 incoming connections, 20 more for MSA
+smtp_accept_max = 40
+smtp_accept_reserve = 20
+smtp_reserve_hosts = ${if eq {$interface_port}{587} {*}}
+
 # Let anyone run 'exim -bp'.
 queue_list_requires_admin = false
 

diff --git a/sites/casper b/sites/casper
index 64b7bdc93d0347ae659c5c8905c1816d0adccd1e..726ac6a07044b2824a4a7b795f1a044a24eb6b5d 100644 (file)
--- a/sites/casper
+++ b/sites/casper
@@ -23,9 +23,6 @@ hostlist relay_hosts = <; localhost ; ::1 ; bombadil.infradead.org ; canuck.infr
 daemon_smtp_port = smtp : msa : 465
 tls_on_connect_ports = 465
 qualify_domain = infradead.org
-smtp_accept_max = 100
-smtp_accept_reserve = 80
-smtp_reserve_hosts = merlin.infradead.org
 
 .include CONFDIR/master