Set mainlog_name and rejectlog_name unconditionally.

[exim.git] / test / confs / 5902

diff --git a/test/confs/5902 b/test/confs/5902
index e7dad63a7cf22cfbbf00ae2f716b6d78b8101100..ec4306b4757efc590523b2d58d06e6700d17832c 100644 (file)
--- a/test/confs/5902
+++ b/test/confs/5902
@@ -1,35 +1,26 @@
 # Exim test configuration 5902
 
 # Exim test configuration 5902
 

+OPT=
+

 .include DIR/aux-var/std_conf_prefix
 
 
 # ----- Main settings -----
 
 qualify_domain = test.ex
 .include DIR/aux-var/std_conf_prefix
 
 
 # ----- Main settings -----
 
 qualify_domain = test.ex

-acl_smtp_rcpt = rcpt
-
-# ----- ACLs -----
-
-begin acl
-
-rcpt:
- accept
- queue = ${if eq {normal}{$local_part} {} {$local_part}}
- logwrite = using queue '$queue_name'

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

-local:
-   driver = accept
-   transport = local_delivery
-   condition = ${if eq {}{$queue_name} {1}{0}}
-

 scan:
    driver = accept
 scan:
    driver = accept

+   condition = ${if eq {OPT}{scan} {y}}

    transport = scan
 
    transport = scan
 

+local:
+   driver = accept
+   transport = local_delivery

 
 # ----- Transports -----
 
 
 # ----- Transports -----
 


@@ -37,18 +28,11 @@ begin transports
 
 scan:
   driver = queuefile
 
 scan:
   driver = queuefile

-  directory = DIR/aux-fixed/5902/outbound
+  directory = DIR/scanner

 
 local_delivery:
   driver = appendfile
 
 local_delivery:
   driver = appendfile

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

   user = CALLER
 
   user = CALLER
 

-# ----- Retry -----
-
-begin retry
-
-* * F,10m,2d
-
-

 # End
 # End