Debug: expansions: refactor ascii-art/UTF8; mark up space & nl

[exim.git] / test / confs / 5700

diff --git a/test/confs/5700 b/test/confs/5700
index 65a1b59baf68ec7527df785fcc563e423fc316d8..758d7d16aa30aac7bcb9184173d0e8e77d7a5aea 100644 (file)
--- a/test/confs/5700
+++ b/test/confs/5700
@@ -1,94 +1,21 @@
 # Exim test configuration 5700
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
 acl_smtp_rcpt = accept
 acl_smtp_data = accept
 
-delivery_event_action = ${acl {logger}}
+event_action = ${acl {logger}}
 
 
 # ----- ACL -----
 
 begin acl
 
-ev_tcp:
-    accept condition = ${if eq {$tpda_event}{tcp:connect}}
-          logwrite = . [$host_address]:$sending_port
-    accept condition = ${if eq {$tpda_event}{tcp:close}}
-          logwrite = . [$sending_ip_address] -> \
-                       [$host_address]:$host_port
-    accept
-
-ev_smtp:
-    accept
-          logwrite = . [$sending_ip_address] -> \
-                       [$host_address]:$host_port
-          logwrite = . banner <$tpda_data>
-
-ev_msg_fail:
-    accept condition = ${if eq {$tpda_event}{msg:fail:delivery}}
-          logwrite = . \
-           refused by fdqn <$host> \
-           local_part <$local_part> \
-           domain <$domain> \
-
-    accept logwrite = . \
-           local_part <$local_part> \
-           domain <$domain> \
-           reason <$tpda_data>
-
-ev_msg:
-    accept condition = ${if eq {fail} {${listextract{2}{$tpda_event}}}}
-          acl = ev_msg_fail
-
-    accept condition = ${if eq {$tpda_event}{msg:complete}}
-          logwrite = . finished: $message_exim_id
-
-    accept condition = ${if !eq {$domain}{domain1}}
-          logwrite = $this_expansion_will_fail
-
-    accept condition = ${if eq {$tpda_event}{msg:delivery}}
-          logwrite = . \
-           delivery \
-           ip <$host_address> \
-           port <$host_port> \
-           fqdn <$host> \
-           local_part <$local_part> \
-           domain <$domain> \
-           confirmation <$tpda_data> \
-           router <$router_name> \
-           transport <$transport_name>
-
-    accept condition = ${if eq {$tpda_event}{msg:host:defer}}
-          logwrite = . \
-           deferral \
-           ip <$host_address> \
-           port <$host_port> \
-           fqdn <$host> \
-           local_part <$local_part> \
-           domain <$domain> \
-           errno <$tpda_defer_errno> \
-           errstr <$tpda_data> \
-           router <$router_name> \
-           transport <$transport_name>
-
-logger:
-    warn   logwrite = event $tpda_event
-    accept condition = ${if eq {tcp} {${listextract{1}{$tpda_event}}}}
-          acl = ev_tcp
-    accept condition = ${if eq {smtp} {${listextract{1}{$tpda_event}}}}
-          acl = ev_smtp
-    accept condition = ${if eq {msg} {${listextract{1}{$tpda_event}}}}
-          acl = ev_msg
+.include DIR/aux-fixed/event-logger-acl
 
 
 # ----- Routers -----
@@ -105,6 +32,7 @@ others:
   route_list = * 127.0.0.1 byname
   self = send
   transport = smtp
+  errors_to = ""
   no_more
 
 
@@ -115,8 +43,9 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
+  hosts_try_fastopen = :
   command_timeout = 1s
   final_timeout = 1s
-  tpda_event_action =   ${acl {logger}}
+  event_action =   ${acl {logger}}
 
 # End