X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=test%2Fconfs%2F4020;h=dc0db460e9b7a48d5333942b544ef2f5de2f29e4;hb=6d9b05ae272ca2122b48451c317d601e449af932;hp=8a3a91fccaa081d4a61f617af643ba1a35bf1961;hpb=7eb6c37c5084760c1d1469bd4be652b479a8df55;p=user%2Fhenk%2Fcode%2Fexim.git

diff --git a/test/confs/4020 b/test/confs/4020
index 8a3a91fcc..dc0db460e 100644
--- a/test/confs/4020
+++ b/test/confs/4020
@@ -2,20 +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
+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
@@ -34,11 +40,13 @@ 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
+  hide socks_proxy =	HOSTIPV4 port=PORT_D OPT
+  hosts_try_fastopen =	${if eq {$local_part}{user_tfo} {*}}
+  debug_print =		transport_name <$transport_name>
+  event_action =	${if eq {smtp:connect}{$event_name} {${acl {logger}}} {}}
 
 
 # End