projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4794ad3
)
Preserve $local_part_suffix when forwarding to master
author
Tollef Fog Heen
<tfheen@err.no>
Fri, 26 Jul 2013 19:31:24 +0000
(21:31 +0200)
committer
Tollef Fog Heen
<tfheen@err.no>
Fri, 26 Jul 2013 19:31:24 +0000
(21:31 +0200)
modules/exim/templates/eximconf.erb
patch
|
blob
|
history
diff --git
a/modules/exim/templates/eximconf.erb
b/modules/exim/templates/eximconf.erb
index
63dfe79
..
a2cfefc
100644
(file)
--- a/
modules/exim/templates/eximconf.erb
+++ b/
modules/exim/templates/eximconf.erb
@@
-1438,9
+1438,16
@@
virt_users:
transport_current_directory = ${extract{directory}{VDOMAINDATA}}
user = ${extract{user}{VDOMAINDATA}}
group = ${extract{group}{VDOMAINDATA}}
transport_current_directory = ${extract{directory}{VDOMAINDATA}}
user = ${extract{user}{VDOMAINDATA}}
group = ${extract{group}{VDOMAINDATA}}
+ # Manually construct the forwarding address, preserving the
+ # local_part_suffix if the remote host is master.
data = ${if exists{${extract{directory}{VDOMAINDATA}{${value}/mail-forward.cdb}}}\
data = ${if exists{${extract{directory}{VDOMAINDATA}{${value}/mail-forward.cdb}}}\
- {${lookup{$local_part}cdb\
- {${extract{directory}{VDOMAINDATA}{${value}/mail-forward.cdb}}}}}}
+ {${local_part:${lookup{$local_part}cdb\
+ {${extract{directory}{VDOMAINDATA}{${value}/mail-forward.cdb}}}}}\
+ ${if eq {${domain:${lookup{$local_part}cdb\
+ {${extract{directory}{VDOMAINDATA}{${value}/mail-forward.cdb}}}}}}{master.debian.org}{$local_part_suffix} {}}\
+ @\
+ ${domain:${lookup{$local_part}cdb\
+ {${extract{directory}{VDOMAINDATA}{${value}/mail-forward.cdb}}}}}}}
domains = +virtual_domains
file_transport = address_file
headers_add = "Delivered-To: ${local_part}${local_part_suffix}@${domain}"
domains = +virtual_domains
file_transport = address_file
headers_add = "Delivered-To: ${local_part}${local_part_suffix}@${domain}"