eximconf: force mail to Google to be routed via IPv4

[mirror/dsa-puppet.git] / modules / exim / templates / eximconf.erb

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 5d0f03a..f5b4d8c 100644 (file)
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -132,7 +132,9 @@ hostlist debianhosts = <; ; 127.0.0.1 ; ::1 ; /var/lib/misc/thishost/debianhosts
 
 hostlist reservedaddrs = 0.0.0.0/8 : 127.0.0.0/8 : 10.0.0.0/8 : 169.254.0.0/16 : 172.16.0.0/12 : 192.0.0.0/24 : 192.168.0.0/16 : 224.0.0.0/4 : 240.0.0.0/5 : 248.0.0.0/5
 
-domainlist google_mxen = aspmx.l.google.com : gmail-smtp-in.l.google.com
+domainlist google_mxen = aspmx.l.google.com : gmail-smtp-in.l.google.com : \
+                         *.aspmx.l.google.com : *.gmail-smtp-in.l.google.com
+
 domainlist single_domain_mx = +google_mxen
 
 <%- if @is_mailrelay -%>
@@ -152,7 +154,7 @@ tls_crl = /etc/exim4/ssl/ca.crl
 # expensive, you can specify the networks for which a lookup is done, or
 # remove the setting entirely.
 host_lookup = *
-# dns_ipv4_lookup = !localhost (disabled upon sgrans request, zobel, 2010-03-16)
+dns_ipv4_lookup = +google_mxen
 
 # If this option is set, then any process that is running as one of the
 # listed users may pass a message to Exim and specify the sender's