X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/b1929cd76c53cc62328ec5204e115ceb6d77229b..fe12ec888ef7b81ee0f5874ca6201ba11b0e9b19:/test/confs/5700 diff --git a/test/confs/5700 b/test/confs/5700 index 52b28018a..774e76605 100644 --- a/test/confs/5700 +++ b/test/confs/5700 @@ -1,39 +1,22 @@ # 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 +event_action = ${acl {logger}} + # ----- ACL ----- begin acl -logger: - accept condition = ${if eq {$acl_arg2}{domain1}} - logwrite = \ - $acl_arg1 \ - ip <$tpda_delivery_ip> \ - port <$tpda_delivery_port> \ - fqdn <$tpda_delivery_fqdn> \ - local_part <$tpda_delivery_local_part> \ - domain <$tpda_delivery_domain> \ - confirmation <$tpda_delivery_confirmation> \ - errno <$tpda_defer_errno> \ - errstr <$tpda_defer_errstr> \ - router <$router_name> \ - transport <$transport_name> - - accept logwrite = $this_expansion_will_fail +.include DIR/aux-fixed/event-logger-acl + # ----- Routers ----- @@ -49,6 +32,7 @@ others: route_list = * 127.0.0.1 byname self = send transport = smtp + errors_to = "" no_more @@ -61,7 +45,6 @@ smtp: port = PORT_S command_timeout = 1s final_timeout = 1s - tpda_delivery_action = ${acl {logger} {delivery} {$domain} } - tpda_host_defer_action = ${acl {logger} {deferral} {$domain} } + event_action = ${acl {logger}} # End