base.m4: Remove redundant haereses.

[exim-config] / base.m4

diff --git a/base.m4 b/base.m4
index 32cf73e..21f774b 100644 (file)
--- a/base.m4
+++ b/base.m4
@@ -44,6 +44,7 @@ extra_local_interfaces = <; 0.0.0.0 ; ::0
 
 SECTION(global, resource)m4_dnl
 deliver_queue_load_max = 8
+message_size_limit = 500M
 queue_only_load = 12
 smtp_accept_max = 16
 smtp_accept_queue = 32
@@ -212,8 +213,7 @@ mail_check_sender:
 
        ## See whether there's a special exception for this sender domain.
        accept   senders = ${LOOKUP_DOMAIN($sender_address_domain,
-                            {KV(senders, {$value}{})},
-                            {})}
+                            {KV(senders)})}
 
        ## Ensure that the sender is routable.  This is important to prevent
        ## undeliverable bounces.
@@ -433,6 +433,7 @@ SECTION(transports)m4_dnl
 ## it into the transport name.  This is very unpleasant, of course.
 smtp:
        driver = smtp
+       SMTP_DELIVERY
        APPLY_HEADER_CHANGES
        tls_require_ciphers = CONF_acceptable_ciphers
        tls_dh_min_bits = 508
@@ -532,6 +533,13 @@ DIVERT(null)
 ### Retry configuration.
 
 SECTION(retry, default)m4_dnl
+## Be persistent when sending to the site relay.  It ought to work, but
+## particularly satellites such as laptops often encounter annoying temporary
+## failures due to network unavailability, and the usual gradual policy can
+## leave mail building up for no good reason.
+CONF_smarthost                         * \
+       F,4d,15m
+
 ## Default.
 *                                      * \
        F,2h,15m; G,16h,2h,1.5; F,4d,6h