Merge branch 'fix-2016-dkim'

[users/heiko/exim.git] / test / confs / 0534

diff --git a/test/confs/0534 b/test/confs/0534
index 5e83476fbcf87a420c56ba7b63ceffd986760db6..db19f253ac20509bc3de6a21f572ec358119246d 100644 (file)
--- a/test/confs/0534
+++ b/test/confs/0534
@@ -1,50 +1,25 @@
 # Exim test configuration 0534
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
+acl_smtp_connect = two
 
 
-# ----- 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
+# ----- ACLs -----
 
+begin ACL
 
-# ----- Transports -----
+one:
+  accept hosts = 1.2.3.4
 
-begin transports
+MACRO_DEFINITION=5.6.7.8
 
-t1:
-  driver = appendfile
-  envelope_to_add
-  user = CALLER
-  batch_max = 10
+two:
+  accept hosts = MACRO_DEFINITION
 
-t2:
-  driver = pipe
-  user = CALLER
-  batch_max = 10
 
 # End