Merge branch 'master' into 4.next

[exim.git] / test / confs / 0143

diff --git a/test/confs/0143 b/test/confs/0143
index c853c80723a388e04ac7240f1aa3aafde3f7ea54..f451be3940107fe2618e5af4f7fab986814e74a9 100644 (file)
--- a/test/confs/0143
+++ b/test/confs/0143
@@ -1,13 +1,8 @@
 # Exim test configuration 0143
 
 # Exim test configuration 0143
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+

 primary_hostname = myhost.test.ex
 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 -----
 
 
 # ----- Main settings -----
 


@@ -18,12 +13,13 @@ domainlist local_domains = test.ex : *.test.ex
 
 begin routers
 
 
 begin routers
 

-all:
+my_main_router:

   driver = manualroute
   domains = ! +local_domains
   route_list = * 127.0.0.1
   self = send
   driver = manualroute
   domains = ! +local_domains
   route_list = * 127.0.0.1
   self = send

-  transport = smtp
+  transport = my_smtp
+  debug_print = router_name <$router_name>

   no_more
 
 
   no_more
 
 


@@ -31,10 +27,12 @@ all:
 
 begin transports
 
 
 begin transports
 

-smtp:
+my_smtp:

   driver = smtp
   interface = HOSTIPV4
   port = PORT_S
   driver = smtp
   interface = HOSTIPV4
   port = PORT_S

+  hosts_try_fastopen = :
+  debug_print = transport_name <$transport_name> from router <$router_name>

 
 
 # End
 
 
 # End