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: use \N rather than double escaping
[mirror/dsa-puppet.git]
/
modules
/
exim
/
templates
/
eximconf.erb
diff --git
a/modules/exim/templates/eximconf.erb
b/modules/exim/templates/eximconf.erb
index
ac91dbe
..
b95cd83
100644
(file)
--- a/
modules/exim/templates/eximconf.erb
+++ b/
modules/exim/templates/eximconf.erb
@@
-136,6
+136,7
@@
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
*.aspmx.l.google.com : *.gmail-smtp-in.l.google.com
domainlist single_domain_mx = +google_mxen
+domainlist ipv4_only_domain_mx = +google_mxen
<%- if @is_mailrelay -%>
# Domains we relay for; that is domains that aren't considered local but we
<%- if @is_mailrelay -%>
# Domains we relay for; that is domains that aren't considered local but we
@@
-154,7
+155,6
@@
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 = +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
@@
-819,7
+819,7
@@
check_recipient:
${readsocket{/var/run/postgrey/socket}{$acl_m_pgr}\
{5s}{}{action=DUNNO}}\
}{action=}{}}
${readsocket{/var/run/postgrey/socket}{$acl_m_pgr}\
{5s}{}{action=DUNNO}}\
}{action=}{}}
- message = ${sg{$acl_m_pgr}{
^\\w+\\s*
}{}}
+ message = ${sg{$acl_m_pgr}{
\N^\w+\s*\N
}{}}
log_message = greylisted.
condition = ${if eq{${uc:${substr{0}{5}{$acl_m_pgr}}}}{DEFER}}
log_message = greylisted.
condition = ${if eq{${uc:${substr{0}{5}{$acl_m_pgr}}}}{DEFER}}
@@
-832,7
+832,7
@@
check_recipient:
domains = +handled_domains
local_parts = GREYLIST_LOCAL_PARTS
condition = ${if eq{${uc:${substr_0_7:$acl_m_pgr}}}{PREPEND}}
domains = +handled_domains
local_parts = GREYLIST_LOCAL_PARTS
condition = ${if eq{${uc:${substr_0_7:$acl_m_pgr}}}{PREPEND}}
- message = ${sg{$acl_m_pgr}{
^\\w+\\s*
}{}}
+ message = ${sg{$acl_m_pgr}{
\N^\w+\s*\N
}{}}
<%- end -%>
deny hosts = ${if exists{/etc/exim4/host_blacklist}{/etc/exim4/host_blacklist}{}}
<%- end -%>
deny hosts = ${if exists{/etc/exim4/host_blacklist}{/etc/exim4/host_blacklist}{}}
@@
-1129,7
+1129,11
@@
dnslookup:
{match_domain{$item}{+single_domain_mx}}\
{remote_smtp_single_domain}{remote_smtp}\
}
{match_domain{$item}{+single_domain_mx}}\
{remote_smtp_single_domain}{remote_smtp}\
}
- ignore_target_hosts = +reservedaddrs
+ ignore_target_hosts = +reservedaddrs : \
+ ${if forany{${lookup dnsdb{>: mxh=$domain}}}\
+ {match_domain{$item}{+ipv4_only_domain_mx}}\
+ {::::/0}{}\
+ }
no_more
postmasterish:
no_more
postmasterish:
@@
-1363,7
+1367,7
@@
rt_force_new_verbose:
pipe_transport = rt_pipe
data = "|/usr/bin/rt-mailgate --queue '${lookup{${sg{$local_part}{-comment}{}}}lsearch{RT_QUEUE_MAP}}' --url https://rt.debian.org/ --ca-file /etc/ssl/ca-debian/ca-certificates.crt --action ${if match{$local_part}{.*-comment.*}{comment}{correspond}}"
headers_remove = Subject
pipe_transport = rt_pipe
data = "|/usr/bin/rt-mailgate --queue '${lookup{${sg{$local_part}{-comment}{}}}lsearch{RT_QUEUE_MAP}}' --url https://rt.debian.org/ --ca-file /etc/ssl/ca-debian/ca-certificates.crt --action ${if match{$local_part}{.*-comment.*}{comment}{correspond}}"
headers_remove = Subject
- headers_add = "Delivered-To: ${local_part}${local_part_suffix}@${domain}\nSubject: ${if and {{first_delivery}{match {$h_subject:}{
(?is)(.*?)\\\\[?debian rt\\\\]?[:\\s]*(.*)
}}} {$1$2}{$h_subject:}}"
+ headers_add = "Delivered-To: ${local_part}${local_part_suffix}@${domain}\nSubject: ${if and {{first_delivery}{match {$h_subject:}{
\N(?is)(.*?)\[?debian rt\]?[:\s]*(.*)\N
}}} {$1$2}{$h_subject:}}"
# FIXME: figure out how to generalize this approach so that all of the following would work
# - rt+NNNN@rt.debian.org : attach correspondence to ticket (verbose)
# FIXME: figure out how to generalize this approach so that all of the following would work
# - rt+NNNN@rt.debian.org : attach correspondence to ticket (verbose)
@@
-1380,7
+1384,7
@@
rt_force_new_quiesce:
pipe_transport = rt_pipe
data = "|/usr/bin/rt-mailgate --queue '${lookup{${sg{$local_part}{-comment}{}}}lsearch{RT_QUEUE_MAP}}' --url https://rt.debian.org/ --ca-file /etc/ssl/ca-debian/ca-certificates.crt --action ${if match{$local_part}{.*-comment.*}{comment}{correspond}}"
headers_remove = Subject
pipe_transport = rt_pipe
data = "|/usr/bin/rt-mailgate --queue '${lookup{${sg{$local_part}{-comment}{}}}lsearch{RT_QUEUE_MAP}}' --url https://rt.debian.org/ --ca-file /etc/ssl/ca-debian/ca-certificates.crt --action ${if match{$local_part}{.*-comment.*}{comment}{correspond}}"
headers_remove = Subject
- headers_add = "Delivered-To: ${local_part}${local_part_suffix}@${domain}\nX-RT-Mode: quiesce\nSubject: ${if and {{first_delivery}{match {$h_subject:}{
(?is)(.*?)\\\\[?debian rt\\\\]?[:\\s]*(.*)
}}} {$1$2}{$h_subject:}}"
+ headers_add = "Delivered-To: ${local_part}${local_part_suffix}@${domain}\nX-RT-Mode: quiesce\nSubject: ${if and {{first_delivery}{match {$h_subject:}{
\N(?is)(.*?)\[?debian rt\]?[:\s]*(.*)\N
}}} {$1$2}{$h_subject:}}"
rt_otherwise:
debug_print = "R: rt for $local_part@$domain"
rt_otherwise:
debug_print = "R: rt for $local_part@$domain"
@@
-1393,7
+1397,7
@@
rt_otherwise:
pipe_transport = rt_pipe
data = "|/usr/bin/rt-mailgate --queue '${lookup{${sg{$local_part}{-(comment|done)}{}}}lsearch{RT_QUEUE_MAP}}' --url https://rt.debian.org/ --ca-file /etc/ssl/ca-debian/ca-certificates.crt --extension ticket --action ${if match{$local_part}{.*-comment.*}{comment}{${if match{$local_part}{.*-done.*}{correspond-resolve}{correspond}}}}"
headers_remove = Subject
pipe_transport = rt_pipe
data = "|/usr/bin/rt-mailgate --queue '${lookup{${sg{$local_part}{-(comment|done)}{}}}lsearch{RT_QUEUE_MAP}}' --url https://rt.debian.org/ --ca-file /etc/ssl/ca-debian/ca-certificates.crt --extension ticket --action ${if match{$local_part}{.*-comment.*}{comment}{${if match{$local_part}{.*-done.*}{correspond-resolve}{correspond}}}}"
headers_remove = Subject
- headers_add = "Delivered-To: ${local_part}${local_part_suffix}@${domain}\nSubject: ${if and {{first_delivery}{match {$h_subject:}{
(?i)(.*?)\\\\[?debian rt\\\\]?[:\\s]*(.*)
}}} {$1$2}{$h_subject:}}"
+ headers_add = "Delivered-To: ${local_part}${local_part_suffix}@${domain}\nSubject: ${if and {{first_delivery}{match {$h_subject:}{
\N(?i)(.*?)\[?debian rt\]?[:\s]*(.*)\N
}}} {$1$2}{$h_subject:}}"
<%- end -%>
# Exim fails the router if it can't change to the user/group for delivery
<%- end -%>
# Exim fails the router if it can't change to the user/group for delivery