X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/4ed8d31a9ccdfc4a948703fd8ac3f7cb6b8fdf8e..8120bdf12e2008621c0a3c4f965075528a0b0005:/test/confs/5402 diff --git a/test/confs/5402 b/test/confs/5402 index aff16fad4..0984e0cc9 100644 --- a/test/confs/5402 +++ b/test/confs/5402 @@ -1,34 +1,25 @@ # Exim test configuration 5402 -exim_path = EXIM_PATH -host_lookup_order = bydns +.include DIR/aux-var/std_conf_prefix + primary_hostname = myhost.test.ex -rfc1413_query_timeout = 0s -spool_directory = DIR/spool -log_file_path = DIR/spool/log/%slog -gecos_pattern = "" -gecos_name = CALLER_NAME # ----- Main settings ----- -log_selector = +smtp_confirmation -tls_advertise_hosts = * -tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} - domainlist local_domains = test.ex : *.test.ex -acl_smtp_rcpt = ${if eq {SERVER}{server}{queue}{cutthrough}} +acl_smtp_rcpt = acl_rcpt # ----- ACLs ------- begin acl -cutthrough: - accept control = cutthrough_delivery - verify = recipient +acl_rcpt: +.ifdef OPT + warn control = cutthrough_delivery +.endif + accept verify = recipient/callout=use_sender -queue: - accept control = queue_only # ----- Routers ----- @@ -39,7 +30,6 @@ all: domains = ! +local_domains route_list = * 127.0.0.1 self = send - address_data = $local_part transport = smtp no_more @@ -51,8 +41,7 @@ begin transports smtp: driver = smtp interface = HOSTIPV4 - port = PORT_D - hosts_avoid_tls = ${if eq {$address_data}{usery}{*}{:}} + port = PORT_S # End