testsuite: tidy logs/4520 and confs/4520

[exim.git] / test / confs / 0386

diff --git a/test/confs/0386 b/test/confs/0386
index b466066a3c68e00921dbf9990d90b93e3f9683b0..983af9bd43d63a29401373a8c11d2e8ebfc6f872 100644 (file)
--- a/test/confs/0386
+++ b/test/confs/0386
@@ -1,21 +1,27 @@
 # Exim test configuration 0386
 
 # Exim test configuration 0386
 

-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 -----
 

-acl_smtp_rcpt = DIR/aux-fixed/TESTNUM.acl$local_part
+acl_smtp_rcpt = chk_rcpt

 qualify_domain = test.ex
 trusted_users = CALLER
 
 
 qualify_domain = test.ex
 trusted_users = CALLER
 
 

+# ----- ACL -----
+begin acl
+
+chk_rcpt:
+  accept       local_parts = 1
+               endpass
+               acl = DIR/aux-fixed/TESTNUM.acl1
+  accept       local_parts = 2
+               endpass
+               acl = DIR/aux-fixed/TESTNUM.acl2
+

 # ----- Routers -----
 
 begin routers
 # ----- Routers -----
 
 begin routers


@@ -30,7 +36,7 @@ begin transports
 
 t1:
   driver = appendfile
 
 t1:
   driver = appendfile

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

   user = CALLER
 
 
   user = CALLER