X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=test%2Fconfs%2F0016;h=f8cbb7cbb74f4e64108d0b6b85d5a81c0c04f208;hb=6d9b05ae272ca2122b48451c317d601e449af932;hp=7001b97749d3bb2dfb9369798ae2220cf06dee1e;hpb=bc3c7bb7d4aba3e563434e5627fe1f2176aa18c0;p=user%2Fhenk%2Fcode%2Fexim.git

diff --git a/test/confs/0016 b/test/confs/0016
index 7001b9774..f8cbb7cbb 100644
--- a/test/confs/0016
+++ b/test/confs/0016
@@ -1,13 +1,7 @@
 # Exim test configuration 0016
 
-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 -----
 
@@ -23,7 +17,7 @@ userforward:
   allow_filter
   user = CALLER
   local_parts = userx : CALLER
-  file = DIR/aux-fixed/0016.filter.$local_part
+  file = DIR/aux-fixed/0016.filter.$local_part_data
   local_part_suffix = +*
   local_part_suffix_optional
   reply_transport = address_reply
@@ -45,8 +39,12 @@ local_delivery:
   user = CALLER
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/$local_part
+  headers_add = X-local_part: $local_part\n\
+		X-local_part_suffix: $local_part_suffix\n\
+		X-local_part_suffix_v: $local_part_suffix_v
   return_path_add
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
 
 address_reply:
   driver = autoreply