Testsuite: munge for error message sizes in retry records

[exim.git] / test / confs / 4020

diff --git a/test/confs/4020 b/test/confs/4020
index 8e2f6b0527caa2f729a4fcb2d0151f05e11ebdcd..6702dcd6895e8a41f1ac02a62faa12c9e5b9fd43 100644 (file)
--- a/test/confs/4020
+++ b/test/confs/4020
@@ -2,21 +2,26 @@
 
 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 =
+queue_run_in_order

 
 # ----- 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
 
 

+# ----- 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
 # ----- Routers -----
 
 begin routers


@@ -35,11 +40,15 @@ 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 =   HOSTIPV4 port=PORT_D OPT
+  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
 
 
 # End