git://git.exim.org
/
users
/
heiko
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Docs: typos
[users/heiko/exim.git]
/
test
/
confs
/
5050
diff --git
a/test/confs/5050
b/test/confs/5050
index acda86a555752b871201dd48dc5d8aee217067a9..af6220121d2503ff067425b2166629ed5dee6970 100644
(file)
--- a/
test/confs/5050
+++ b/
test/confs/5050
@@
-1,11
+1,7
@@
# Exim test configuration 5050
# Exim test configuration 5050
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+
# ----- Main settings -----
# ----- Main settings -----
@@
-23,7
+19,9
@@
localuser:
local_part_prefix = bsmtp_ : mmdf_ : mbx_
local_part_prefix_optional
retry_use_local_part
local_part_prefix = bsmtp_ : mmdf_ : mbx_
local_part_prefix_optional
retry_use_local_part
- transport = ${local_part_prefix}local_delivery
+ transport = ${if eq {bsmtp_} {${local_part_prefix}} {bsmtp_} \
+ {${if eq {mmdf_} {${local_part_prefix}} {mmdf_} \
+ {${if eq {mbx_} {${local_part_prefix}} {mbx_}{}}}}}}local_delivery
# ----- Transports -----
# ----- Transports -----
@@
-34,7
+32,7
@@
local_delivery:
driver = appendfile
delivery_date_add
envelope_to_add
driver = appendfile
delivery_date_add
envelope_to_add
- file = DIR/test-mail/$
local_part
+ file = DIR/test-mail/$
{bless:$local_part}
file_format = "From : local_delivery :\
*mbx*\r\n : mbx_local_delivery :\
tpmissing : tpmissing"
file_format = "From : local_delivery :\
*mbx*\r\n : mbx_local_delivery :\
tpmissing : tpmissing"
@@
-47,7
+45,7
@@
bsmtp_local_delivery:
use_bsmtp
delivery_date_add
envelope_to_add
use_bsmtp
delivery_date_add
envelope_to_add
- file = DIR/test-mail/$
local_part
+ file = DIR/test-mail/$
{bless:$local_part}
return_path_add
user = CALLER
return_path_add
user = CALLER
@@
-56,7
+54,7
@@
mbx_local_delivery:
check_string =
delivery_date_add
envelope_to_add
check_string =
delivery_date_add
envelope_to_add
- file = DIR/test-mail/$
local_part
+ file = DIR/test-mail/$
{bless:$local_part}
mbx_format
message_prefix =
return_path_add
mbx_format
message_prefix =
return_path_add