projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
eximconf: split log_selector to one item per line
[mirror/dsa-puppet.git]
/
modules
/
exim
/
templates
/
eximconf.erb
diff --git
a/modules/exim/templates/eximconf.erb
b/modules/exim/templates/eximconf.erb
index
0010ac5
..
5d2d137
100644
(file)
--- a/
modules/exim/templates/eximconf.erb
+++ b/
modules/exim/templates/eximconf.erb
@@
-32,6
+32,8
@@
# flushing' operations, but should be populated with a list
# of trusted machines. Wildcards are not permitted
# bsmtp_domains - Domains that we deliver locally via bsmtp
# flushing' operations, but should be populated with a list
# of trusted machines. Wildcards are not permitted
# bsmtp_domains - Domains that we deliver locally via bsmtp
+# submission-domains - Domains for which mail will be accepted via the
+# submission port
<%- if @is_mailrelay -%>
# mailhubdomains - Domains for which we are the MX, but the mail is relayed
# elsewhere. This is designed for use with small volume or
<%- if @is_mailrelay -%>
# mailhubdomains - Domains for which we are the MX, but the mail is relayed
# elsewhere. This is designed for use with small volume or
@@
-126,10
+128,15
@@
localpartlist local_only_users = lsearch;/etc/exim4/localusers
localpartlist postmasterish = postmaster : abuse : hostmaster
localpartlist postmasterish = postmaster : abuse : hostmaster
-hostlist debianhosts = <; ; 127.0.0.1 ; ::1 ; /var/lib/misc/thishost/debianhosts
; 89.16.166.49 ; 82.195.75.76 ; 2001:41b8:202:deb:bab5:0:52c3:4b4c
+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
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 : \
+ *.aspmx.l.google.com : *.gmail-smtp-in.l.google.com
+
+domainlist single_domain_mx = +google_mxen
+
<%- if @is_mailrelay -%>
# Domains we relay for; that is domains that aren't considered local but we
# accept mail for them.
<%- if @is_mailrelay -%>
# Domains we relay for; that is domains that aren't considered local but we
# accept mail for them.
@@
-147,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 = *
# 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
# 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
@@
-171,6
+178,13
@@
local_from_check = false
gecos_pattern = ^([^,:]*)
gecos_name = $1
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
# This tells Exim to immediately discard error messages (ie double bounces).
ignore_bounce_errors_after = 0s
auto_thaw = 1d
@@
-247,7
+261,15
@@
pipelining_advertise_hosts = !*
tls_advertise_hosts = *
smtp_enforce_sync = true
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 \
+ +deliver_time \
+ +smtp_connection \
+ +smtp_incomplete_transaction \
+ +smtp_confirmation \
+ +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}}}}\
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}}}}\
@@
-1055,7
+1077,10
@@
begin routers
relay_manualroute:
driver = manualroute
domains = +mailhubdomains
relay_manualroute:
driver = manualroute
domains = +mailhubdomains
- transport = remote_smtp
+ transport = ${if forany{${lookup dnsdb{>: mxh=$domain}}}\
+ {match_domain{$item}{+single_domain_mx}}\
+ {remote_smtp_single_domain}{remote_smtp}\
+ }
route_data = ${lookup{$domain}lsearch{/etc/exim4/manualroute}}
require_files = /etc/exim4/manualroute
route_data = ${lookup{$domain}lsearch{/etc/exim4/manualroute}}
require_files = /etc/exim4/manualroute
@@
-1098,7
+1123,10
@@
dnslookup:
debug_print = "R: dnslookup for $local_part@$domain"
driver = dnslookup
domains = !+handled_domains
debug_print = "R: dnslookup for $local_part@$domain"
driver = dnslookup
domains = !+handled_domains
- transport = remote_smtp
+ transport = ${if forany{${lookup dnsdb{>: mxh=$domain}}}\
+ {match_domain{$item}{+single_domain_mx}}\
+ {remote_smtp_single_domain}{remote_smtp}\
+ }
ignore_target_hosts = +reservedaddrs
no_more
ignore_target_hosts = +reservedaddrs
no_more
@@
-1561,6
+1589,14
@@
remote_smtp:
tls_certificate = /etc/exim4/ssl/thishost.crt
tls_privatekey = /etc/exim4/ssl/thishost.key
tls_certificate = /etc/exim4/ssl/thishost.crt
tls_privatekey = /etc/exim4/ssl/thishost.key
+remote_smtp_single_domain:
+ driver = smtp
+ connect_timeout = 15s
+ delay_after_cutoff = false
+ no_multi_domain
+ tls_certificate = /etc/exim4/ssl/thishost.crt
+ tls_privatekey = /etc/exim4/ssl/thishost.key
+
<%- if @use_smarthost -%>
remote_smtp_smarthost:
debug_print = "T: remote_smtp_smarthost for $local_part@$domain"
<%- if @use_smarthost -%>
remote_smtp_smarthost:
debug_print = "T: remote_smtp_smarthost for $local_part@$domain"