X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/1d717e1c110562fd6bf28478c79f180cafeba776..46694b802ce0302f3c3344be933cc9737d4d4f4c:/test/confs/2138?ds=sidebyside diff --git a/test/confs/2138 b/test/confs/2138 index d5dba1b3f..c255373b5 100644 --- a/test/confs/2138 +++ b/test/confs/2138 @@ -19,11 +19,7 @@ remote_max_parallel = 1 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 ----- @@ -50,17 +46,18 @@ 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 + driver = smtp allow_localhost - port = PORT_D + port = PORT_D hosts_try_fastopen = : - hosts_noproxy_tls = : - tls_try_verify_hosts = : - max_rcpt = 1 + hosts_noproxy_tls = : + tls_verify_certificates = DIR/aux-fixed/cert1 + tls_verify_cert_hostnames = : + max_rcpt = 1 # End