X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/bc3c7bb7d4aba3e563434e5627fe1f2176aa18c0..68d0c019bace3e1d956ea54d4c5276b8c45b6c1d:/test/confs/3461?ds=inline diff --git a/test/confs/3461 b/test/confs/3461 index 45a28fd62..b793a4f36 100644 --- a/test/confs/3461 +++ b/test/confs/3461 @@ -1,15 +1,11 @@ # Exim test configuration 3461 SERVER = +PEX = : + +.include DIR/aux-var/tls_conf_prefix -exim_path = EXIM_PATH -keep_environment = -host_lookup_order = bydns primary_hostname = myhost.test.ex -spool_directory = DIR/spool -log_file_path = DIR/spool/log/SERVER%slog -gecos_pattern = "" -gecos_name = CALLER_NAME # ----- Main settings ----- @@ -23,11 +19,7 @@ queue_run_in_order 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 # ----- Authenticators ----- @@ -66,6 +58,7 @@ begin transports local_delivery: driver = appendfile file = DIR/test-mail/$local_part + create_file = DIR/test-mail headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER @@ -73,8 +66,11 @@ send_to_server: driver = smtp allow_localhost hosts = 127.0.0.1 - hosts_try_auth = * port = PORT_D - tls_try_verify_hosts = : + hosts_try_fastopen = : + hosts_try_auth = * + hosts_noproxy_tls = PEX + tls_verify_certificates = DIR/aux-fixed/cert1 + tls_verify_cert_hostnames = : # End