Merge branch '4.next'

[users/heiko/exim.git] / test / confs / 0131

diff --git a/test/confs/0131 b/test/confs/0131
index 50ae1db14470dcc64aa41511c1d45e2842dc7797..c3df9a89e7d5660a4ad1312df3b1dd078b2716d6 100644 (file)
--- a/test/confs/0131
+++ b/test/confs/0131
@@ -1,11 +1,7 @@
 # Exim test configuration 0131
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-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 -----
 
@@ -29,7 +25,7 @@ forward:
   driver = redirect
   allow_filter
   no_check_local_user
-  file = DIR/aux-fixed/TESTNUM.$local_part
+  file = DIR/aux-fixed/TESTNUM.${bless:$local_part}
   retry_use_local_part
   user = CALLER
   address_data = $address_data-forward
@@ -47,7 +43,7 @@ begin transports
 
 appendfile:
   driver = appendfile
-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}
   user = CALLER
   headers_add = Address-Data: >$address_data<