Testsuite: fix cmdline option for test flavour

[exim.git] / test / confs / 4020

diff --git a/test/confs/4020 b/test/confs/4020
index 8e2f6b0527caa2f729a4fcb2d0151f05e11ebdcd..05c95a571510bb2992f7da92e52eb50110fb3eb1 100644 (file)
--- a/test/confs/4020
+++ b/test/confs/4020
@@ -2,17 +2,14 @@
 
 OPT =
 
 
 OPT =
 

-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

-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 

+log_selector = +proxy +outgoing_port
+

 domainlist local_domains = test.ex : *.test.ex
 acl_smtp_rcpt = accept
 
 domainlist local_domains = test.ex : *.test.ex
 acl_smtp_rcpt = accept
 


@@ -35,11 +32,12 @@ my_main_router:
 begin transports
 
 my_smtp:
 begin transports
 
 my_smtp:

-  driver = smtp
-  interface = HOSTIPV4
-  port = PORT_S
-  socks_proxy = 127.0.0.1 port=PORT_S OPT
-  debug_print = transport_name <$transport_name>
+  driver =             smtp
+  interface =          HOSTIPV4
+  port =               PORT_S
+  hide socks_proxy =   127.0.0.1 port=PORT_D OPT
+  hosts_try_fastopen = ${if eq {$local_part}{user_tfo} {*}}
+  debug_print =                transport_name <$transport_name>

 
 
 # End
 
 
 # End