Logging: add I= element to transport-defer lines. Bug 2675

[exim.git] / test / confs / 0140

diff --git a/test/confs/0140 b/test/confs/0140
index 8ab406add3d940d9be9207c7ce84023e29a9bd48..5661c5df46551babcf27459fedc2d3c3009331b2 100644 (file)
--- a/test/confs/0140
+++ b/test/confs/0140
@@ -1,13 +1,7 @@
 # Exim test configuration 0140
 
-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 -----
 
@@ -28,7 +22,7 @@ reply:
   driver = accept
   retry_use_local_part
   senders = !
-  transport = $local_part
+  transport = ${if eq {reply1}{$local_part} {reply1}{reply2}}
 
 
 # ----- Transports -----
@@ -51,7 +45,7 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}
   return_path_add
   user = CALLER