Merge branch 'master' into transp_logging_1031

[users/jgh/exim.git] / test / confs / 0533

diff --git a/test/confs/0533 b/test/confs/0533
index 8727cc3fb4b4550faf3066db4b84e1e488c7bb5e..941994396fe462fe8afa115753d2354525859b23 100644 (file)
--- a/test/confs/0533
+++ b/test/confs/0533
@@ -1,7 +1,5 @@
 # Exim test configuration 0533
 
 # Exim test configuration 0533
 

-CONNECTCOND=
-

 exim_path = EXIM_PATH
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 exim_path = EXIM_PATH
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex


@@ -13,18 +11,40 @@ gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 

-acl_smtp_rcpt = rcpt
-dns_again_means_nonexist = *
-disable_ipv6

 
 

-# ----- ACL -----

 
 

-begin acl
+# ----- Routers -----
+
+begin routers
+
+r1:
+  driver = redirect
+  local_part_prefix = file-
+  local_part_suffix = =*
+  data = DIR/test-mail/${substr_1:$local_part_suffix}
+  file_transport = t1
+
+r2:
+  driver = redirect
+  local_part_prefix = pipe-
+  local_part_suffix = =*
+  data = |${substr_1:$local_part_suffix}
+  pipe_transport = t2
+
+
+# ----- Transports -----
+
+begin transports
+
+t1:
+  driver = appendfile
+  envelope_to_add
+  user = CALLER
+  batch_max = 10

 
 

-rcpt:
-  accept hosts = +ignore_unknown : \
-    *.$sender_address_domain : \
-    $sender_address_domain : \
-    ${lookup dnsdb{>:defer_never,mxh=$sender_address_domain}}
+t2:
+  driver = pipe
+  user = CALLER
+  batch_max = 10

 
 # End
 
 # End