eximconf: increase log detail

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

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 9768f25..9cf510e 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
@@ -176,6 +178,13 @@ local_from_check = false
 gecos_pattern = ^([^,:]*)
 gecos_name = $1
 
+# Do *not* include the body of the original message in a bounce
+# The combinaton of bounce_return_message and bounce_return_body
+# allows us to return only the headers within a bounce
+
+bounce_return_message = true
+bounce_return_body    = false
+
 # This tells Exim to immediately discard error messages (ie double bounces).
 ignore_bounce_errors_after = 0s
 auto_thaw = 1d
@@ -252,7 +261,20 @@ pipelining_advertise_hosts = !*
 tls_advertise_hosts = *
 smtp_enforce_sync = true
 
-log_selector = +tls_cipher +tls_peerdn +queue_time +deliver_time +smtp_connection +smtp_incomplete_transaction +smtp_confirmation +smtp_protocol_error
+log_selector = \
+               +tls_cipher \
+               +tls_peerdn \
+               +queue_time \
+               +queue_time_overall \
+               +deliver_time \
+               +received_recipients \
+               +unknown_in_list \
+               +smtp_connection \
+               +smtp_incomplete_transaction \
+               +smtp_confirmation \
+               +smtp_syntax_error \
+               +smtp_no_mail \
+               +smtp_protocol_error
 
 received_header_text = Received: ${if def:sender_rcvhost {from $sender_rcvhost\n\t}\
                                  {${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)\n\t}}}}\