DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 0321

diff --git a/test/confs/0321 b/test/confs/0321
index b32615a6b1730f48965781cbc358bf9689acb651..658ad15ce898f1514d45f3fa4453c780b4b09ba1 100644 (file)
--- a/test/confs/0321
+++ b/test/confs/0321
@@ -1,13 +1,7 @@
 # Exim test configuration 0321
 
-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 -----
 
@@ -35,7 +29,9 @@ begin transports
 
 pipe:
   driver = pipe
-  command = /non/exist/command -f <$sender_address> -d $pipe_addresses
+  command = /non/exist/command -f \
+       "<${if match_local_part {$sender_address}{CALLER@test.ex}{$value}}>" \
+       -d $pipe_addresses
   message_prefix =
   message_suffix =
   check_string =
@@ -49,6 +45,7 @@ pipe:
 local_delivery:
   driver = appendfile
   file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER