projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cf8e1a1
)
Do not do MX lookups on smarthost
author
Peter Palfrader
<peter@palfrader.org>
Mon, 17 Jun 2013 11:17:58 +0000
(13:17 +0200)
committer
Peter Palfrader
<peter@palfrader.org>
Mon, 17 Jun 2013 11:17:58 +0000
(13:17 +0200)
modules/exim/templates/eximconf.erb
patch
|
blob
|
history
diff --git
a/modules/exim/templates/eximconf.erb
b/modules/exim/templates/eximconf.erb
index
fb0da2e
..
81da814
100644
(file)
--- a/
modules/exim/templates/eximconf.erb
+++ b/
modules/exim/templates/eximconf.erb
@@
-1072,21
+1072,17
@@
ipliteral:
<%=
out = ""
if not scope.lookupvar('site::nodeinfo')['smarthost'].empty?
<%=
out = ""
if not scope.lookupvar('site::nodeinfo')['smarthost'].empty?
-out =
'
+out =
"
smarthost:
smarthost:
- debug_print =
"R: smarthost for $local_part@$domain
"
+ debug_print =
\"R: smarthost for $local_part@$domain\
"
driver = manualroute
domains = !+handled_domains
transport = remote_smtp_smarthost
driver = manualroute
domains = !+handled_domains
transport = remote_smtp_smarthost
- route_list = * ' + scope.lookupvar('site::nodeinfo')['smarthost']
- if scope.lookupvar('site::nodeinfo')['smarthost'] == 'mailout.debian.org'
- out += '/MX'
- end
- out += '
+ route_list = * #{scope.lookupvar('site::nodeinfo')['smarthost']}
host_find_failed = defer
same_domain_copy_routing = yes
no_more
host_find_failed = defer
same_domain_copy_routing = yes
no_more
-'
+"
end
out
%>
end
out
%>