SMTP fallback for merlin

diff --git a/master b/master
index 2544ddfd9af35661cbb409b46d4618d80eb67210..6e53d923cdac6447a0002228932515070cdd593d 100644 (file)
--- a/master
+++ b/master
@@ -316,6 +316,9 @@ lookuphost:
   transport = REMOTE_OR_VERP_SMTP
   ignore_target_hosts = <; 0.0.0.0 ; 127.0.0.0/8 ; ::1/128 ; fe80::/10; \
                        fec0::/10 ; ff00::/8
+.ifdef SMTP_FALLBACK_HOST
+  fallback_hosts = SMTP_FALLBACK_HOST
+.endif
 
 # If DNS gets screwed up to the extent that our major mail hosts disappear,
 # don't let mail bounce -- defer it until the problem is fixed, instead.

diff --git a/sites/merlin b/sites/merlin
index 6df9b2730f4a275ea5291e56165c9b5a34c90e99..450dafd1a2a85643f482d15338688300e10e603a 100644 (file)
--- a/sites/merlin
+++ b/sites/merlin
@@ -15,6 +15,8 @@ MAILMAN_GID=mailman
 
 DNS_VIRTUAL=CLUSTER/dns-virtual-domains
 
+SMTP_FALLBACK_HOST=desiato.infradead.org
+
 EXIM494=EXIM494
 CRM114=CRM114
 spamd_address = ${if def:acl_m_spamd_address {$acl_m_spamd_address} {127.0.0.1 783}}