X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/875512a36119423217802de1f79350e7fce1cd9b..148d9d517265b06fee1ac15047040e3f1789f280:/test/confs/2113?ds=inline diff --git a/test/confs/2113 b/test/confs/2113 index bb64867a9..b992747e2 100644 --- a/test/confs/2113 +++ b/test/confs/2113 @@ -1,6 +1,7 @@ # Exim test configuration 2113 SERVER = +PEX = : .include DIR/aux-var/tls_conf_prefix @@ -19,16 +20,22 @@ smtp_accept_max_nonmail = 0 tls_advertise_hosts = * -# Set certificate only if server - -tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} -tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} +tls_certificate = DIR/aux-fixed/cert1 # ----- Routers ----- begin routers +.ifdef REQUIRE +cl_override: + driver = manualroute + route_data = HOSTIPV4 + retry_use_local_part + transport = send_to_server + self = send +.endif + client: driver = accept condition = ${if eq {SERVER}{server}{no}{yes}} @@ -47,16 +54,19 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER send_to_server: driver = smtp allow_localhost + hosts_override hosts = 127.0.0.1 - hosts_noproxy_tls = : port = PORT_D - tls_try_verify_hosts = : + hosts_try_fastopen = : + hosts_noproxy_tls = PEX + tls_verify_certificates = DIR/aux-fixed/cert1 + tls_verify_cert_hostnames = : # End