DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 4020

diff --git a/test/confs/4020 b/test/confs/4020
index 794272e6d119b54be8b39ace566721296259ee52..763acc15a381f3b199d1263870696cd072411274 100644 (file)
--- a/test/confs/4020
+++ b/test/confs/4020
@@ -2,14 +2,10 @@
 
 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 -----
 
@@ -19,6 +15,13 @@ 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
@@ -37,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_D 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