X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/81f360d7c6892ac17aeec7686bc8d22eb02cac71..0bfd436d7bd8026bcf1d366af98959e54ca19f8f:/cookbooks/exim/templates/default/exim4.conf.erb

diff --git a/cookbooks/exim/templates/default/exim4.conf.erb b/cookbooks/exim/templates/default/exim4.conf.erb
index 939b2abcd..a00aefd8c 100644
--- a/cookbooks/exim/templates/default/exim4.conf.erb
+++ b/cookbooks/exim/templates/default/exim4.conf.erb
@@ -657,6 +657,7 @@ begin transports
 
 remote_smtp:
   driver = smtp
+  multi_domain = false
 
 
 # This transport is used for handling pipe deliveries generated by alias or
@@ -775,7 +776,7 @@ begin retry
 # There are no rewriting specifications in this default configuration file.
 
 begin rewrite
-*@<%= node[:fqdn] %> $1@openstreetmap.org E
+*@<%= node[:fqdn] %> "${if !match {${lookup{$1}lsearch{/etc/aliases}{$value}}}{@} {$1@openstreetmap.org}fail}" Eh
 <% node[:exim][:rewrites].each do |rewrite| -%>
 <%= rewrite[:pattern] %> <%= rewrite[:replacement] %> <%= rewrite[:flags] %>
 <% end -%>