projects
/
chef.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3324312
)
Don't rewrite addresses that are in the aliases file
author
Tom Hughes
<tom@compton.nu>
Tue, 10 Jul 2018 19:15:05 +0000
(20:15 +0100)
committer
Tom Hughes
<tom@compton.nu>
Tue, 10 Jul 2018 19:15:05 +0000
(20:15 +0100)
cookbooks/exim/templates/default/exim4.conf.erb
patch
|
blob
|
history
diff --git
a/cookbooks/exim/templates/default/exim4.conf.erb
b/cookbooks/exim/templates/default/exim4.conf.erb
index fa334682478a260f54984ece37a79aaeacd91bd8..9e285bcf6110336dafb99b1bc1989717c41cbee9 100644
(file)
--- 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
# 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 -%>
<% node[:exim][:rewrites].each do |rewrite| -%>
<%= rewrite[:pattern] %> <%= rewrite[:replacement] %> <%= rewrite[:flags] %>
<% end -%>