Merge from master into 4.next

[exim.git] / test / confs / 0211

diff --git a/test/confs/0211 b/test/confs/0211
index 389437340cdbd393a69c227c7aa0bbee1d89487e..96f3beac19c333913dbb16b52e1b5ab8de19f977 100644 (file)
--- a/test/confs/0211
+++ b/test/confs/0211
@@ -1,12 +1,7 @@
 # Exim test configuration 0211
 
 # Exim test configuration 0211
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
-rfc1413_query_timeout = 0s
-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 -----
 
 
 # ----- Main settings -----
 


@@ -35,7 +30,7 @@ begin routers
 others:
   driver = manualroute
   domains = ! +local_domains
 others:
   driver = manualroute
   domains = ! +local_domains

-  route_list = * 127.0.0.1 byname
+  route_list = * localhost4.test.ex byname

   self = send
   transport = smtp
   no_more
   self = send
   transport = smtp
   no_more