DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 4020

diff --git a/test/confs/4020 b/test/confs/4020
index 05c95a571510bb2992f7da92e52eb50110fb3eb1..763acc15a381f3b199d1263870696cd072411274 100644 (file)
--- a/test/confs/4020
+++ b/test/confs/4020
@@ -5,6 +5,7 @@ OPT =
 .include DIR/aux-var/std_conf_prefix
 
 primary_hostname = myhost.test.ex
 .include DIR/aux-var/std_conf_prefix
 
 primary_hostname = myhost.test.ex

+queue_run_in_order

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


@@ -14,6 +15,13 @@ domainlist local_domains = test.ex : *.test.ex
 acl_smtp_rcpt = accept
 
 
 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,9 +43,16 @@ my_smtp:
   driver =             smtp
   interface =          HOSTIPV4
   port =               PORT_S
   driver =             smtp
   interface =          HOSTIPV4
   port =               PORT_S

-  hide socks_proxy =   127.0.0.1 port=PORT_D OPT
+.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>
   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