X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/23f3dc67a13f71bb8fdf2930052d3fdce85e9774..7b162fc84e202a16b89fa11224737ffbdd240bc8:/test/confs/4020?ds=sidebyside

diff --git a/test/confs/4020 b/test/confs/4020
index 8e2f6b052..763acc15a 100644
--- a/test/confs/4020
+++ b/test/confs/4020
@@ -2,21 +2,26 @@
 
 OPT =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 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 =
+queue_run_in_order
 
 # ----- Main settings -----
 
+log_selector = +proxy +outgoing_port
+
 domainlist local_domains = test.ex : *.test.ex
 acl_smtp_rcpt = accept
 
 
+# ----- ACL -----
+
+begin acl
+
+logger:
+  accept	logwrite = pla $proxy_local_address plp $proxy_local_port pea $proxy_external_address pep $proxy_external_port
+
 # ----- Routers -----
 
 begin routers
@@ -35,11 +40,19 @@ my_main_router:
 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
+.ifdef FALLBACK
+  socks_proxy =		${if eq {1}{1} {}}
+.else
+  hide socks_proxy =	HOSTIPV4 port=PORT_D OPT
+.endif
+  hosts_try_fastopen =	${if eq {$local_part}{user_tfo} {*}}
+  debug_print =		transport_name <$transport_name>
+.ifdef _HAVE_EVENT
+  event_action =	${if eq {smtp:connect}{$event_name} {${acl {logger}}} {}}
+.endif
 
 
 # End