From: Tom Hughes <tom@compton.nu>
Date: Wed, 11 Jul 2018 19:35:17 +0000 (+0100)
Subject: Rewrite aliases that aren't full addresses
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/5e865707737f1985030196dbefa67690221a494e?hp=ccb606407c60d7c89c5f6e8975efd976959eef88

Rewrite aliases that aren't full addresses
---

diff --git a/cookbooks/exim/templates/default/exim4.conf.erb b/cookbooks/exim/templates/default/exim4.conf.erb
index 9e285bcf6..f4db98d06 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] %> "${if eq {${lookup{$1}lsearch{/etc/aliases}{yes}{no}}}{no} {$1@openstreetmap.org}fail}" Eh
+*@<%= 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 -%>