DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 0005

diff --git a/test/confs/0005 b/test/confs/0005
index d4e976e816a427bf3fcb1c1ce71639bbaaf2830c..babeacb41834d953c782c4a673030da024269b72 100644 (file)
--- a/test/confs/0005
+++ b/test/confs/0005
@@ -1,12 +1,7 @@
 # Exim test configuration 0005
 
 # Exim test configuration 0005
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
-rfc1413_query_timeout = 0s
-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 -----
 


@@ -57,7 +52,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/$local_part_data

   headers_add = "X-body-linecount: $body_linecount\n\
                  X-message-linecount: $message_linecount\n\
                  X-received-count: $received_count"
   headers_add = "X-body-linecount: $body_linecount\n\
                  X-message-linecount: $message_linecount\n\
                  X-received-count: $received_count"