testsuite: tidy logs/4520 and confs/4520

[exim.git] / test / confs / 0309

diff --git a/test/confs/0309 b/test/confs/0309
index 2f7ccf0c3d73b62e6873942817a4d40e06c30a53..0a49f221d16984ba771c57bd3b1de078e172dc25 100644 (file)
--- a/test/confs/0309
+++ b/test/confs/0309
@@ -1,13 +1,8 @@
 # Exim test configuration 0309
 
 # Exim test configuration 0309
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+

 primary_hostname = myhost.test.ex
 primary_hostname = myhost.test.ex

-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 


@@ -34,13 +29,13 @@ begin transports
 
 local_delivery:
   driver = appendfile
 
 local_delivery:
   driver = appendfile

-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}

   message_size_limit = $local_part
   user = CALLER
 
 bounce:
   driver = appendfile
   message_size_limit = $local_part
   user = CALLER
 
 bounce:
   driver = appendfile

-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}

   user = CALLER
 
 
   user = CALLER