Merge branch 'master' into 4.next

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

diff --git a/test/confs/0211 b/test/confs/0211
index dd714a2a9df1eb90896dd051e34f8e8fe680484a..7856481dffece63df6957d865c0fb976de09aebb 100644 (file)
--- a/test/confs/0211
+++ b/test/confs/0211
@@ -1,11 +1,7 @@
 # Exim test configuration 0211
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
@@ -34,7 +30,11 @@ begin routers
 others:
   driver = manualroute
   domains = ! +local_domains
-  route_list = * localhost4.test.ex byname
+.ifdef LIST
+  route_data = 127.0.0.1:HOSTIPV4
+.else
+  route_data = localhost4.test.ex byname
+.endif
   self = send
   transport = smtp
   no_more
@@ -52,6 +52,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
+  command_timeout = 1s
 
 local_delivery:
   driver = appendfile