X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/d1af83598f7d6b32516a11bb28e569d592a05c48..148d9d517265b06fee1ac15047040e3f1789f280:/test/confs/5050 diff --git a/test/confs/5050 b/test/confs/5050 index a7d392ecd..af6220121 100644 --- a/test/confs/5050 +++ b/test/confs/5050 @@ -1,13 +1,7 @@ # Exim test configuration 5050 -exim_path = EXIM_PATH -keep_environment = -host_lookup_order = bydns -spool_directory = DIR/spool -log_file_path = DIR/spool/log/%slog -gecos_pattern = "" -gecos_name = CALLER_NAME -tls_advertise_hosts = +.include DIR/aux-var/std_conf_prefix + # ----- Main settings ----- @@ -25,7 +19,9 @@ localuser: 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 ----- @@ -36,7 +32,7 @@ local_delivery: 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" @@ -49,7 +45,7 @@ bsmtp_local_delivery: 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 @@ -58,7 +54,7 @@ mbx_local_delivery: 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