Merge remote branch 'origin'

[exim.git] / test / confs / 0534

diff --git a/test/confs/0534 b/test/confs/0534
index 5e83476fbcf87a420c56ba7b63ceffd986760db6..b148987a5bfd61a42db2196be55d9edad280928d 100644 (file)
--- a/test/confs/0534
+++ b/test/confs/0534
@@ -11,40 +11,20 @@ gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 

+acl_smtp_connect = two

 
 
 
 

-# ----- Routers -----
+# ----- ACLs -----

 
 

-begin routers
+begin ACL

 
 

-r1:
-  driver = redirect
-  local_part_prefix = file-
-  local_part_suffix = =*
-  data = DIR/test-mail/${substr_1:$local_part_suffix}
-  file_transport = t1
+one:
+  accept hosts = 1.2.3.4

 
 

-r2:
-  driver = redirect
-  local_part_prefix = pipe-
-  local_part_suffix = =*
-  data = |${substr_1:$local_part_suffix}
-  pipe_transport = t2
+MACRO_DEFINITION=5.6.7.8

 
 

+two:
+  accept hosts = MACRO_DEFINITION

 
 

-# ----- Transports -----
-
-begin transports
-
-t1:
-  driver = appendfile
-  envelope_to_add
-  user = CALLER
-  batch_max = 10
-
-t2:
-  driver = pipe
-  user = CALLER
-  batch_max = 10

 
 # End
 
 # End