]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
Do not do MX lookups on smarthost
authorPeter Palfrader <peter@palfrader.org>
Mon, 17 Jun 2013 11:17:58 +0000 (13:17 +0200)
committerPeter Palfrader <peter@palfrader.org>
Mon, 17 Jun 2013 11:17:58 +0000 (13:17 +0200)
modules/exim/templates/eximconf.erb

index fb0da2efa7a7ad4578c73308e6673c5d453d6070..81da814ba39492fecc779f83fe6efbc2629828f8 100644 (file)
@@ -1072,21 +1072,17 @@ ipliteral:
 <%=
 out = ""
 if not scope.lookupvar('site::nodeinfo')['smarthost'].empty?
-out = '
+out = "
 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
-  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
-'
+"
 end
 out
 %>