From: Tom Hughes <tom@compton.nu>
Date: Tue, 10 Jul 2018 19:15:05 +0000 (+0100)
Subject: Don't rewrite addresses that are in the aliases file
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/898c9c328b4a83f6595fc247a0af343c11aca83d?hp=33243121ffc92f08550c263963a13707bcf8aed8

Don't rewrite addresses that are in the aliases file
---

diff --git a/cookbooks/exim/templates/default/exim4.conf.erb b/cookbooks/exim/templates/default/exim4.conf.erb
index fa3346824..9e285bcf6 100644
--- a/cookbooks/exim/templates/default/exim4.conf.erb
+++ b/cookbooks/exim/templates/default/exim4.conf.erb
@@ -775,7 +775,7 @@ begin retry
 # There are no rewriting specifications in this default configuration file.
 
 begin rewrite
-*@<%= node[:fqdn] %> $1@openstreetmap.org Eh
+*@<%= node[:fqdn] %> "${if eq {${lookup{$1}lsearch{/etc/aliases}{yes}{no}}}{no} {$1@openstreetmap.org}fail}" Eh
 <% node[:exim][:rewrites].each do |rewrite| -%>
 <%= rewrite[:pattern] %> <%= rewrite[:replacement] %> <%= rewrite[:flags] %>
 <% end -%>