X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/d1af83598f7d6b32516a11bb28e569d592a05c48..d901e231acd1917d24b688cbd7823efc2bed45c4:/test/confs/3462 diff --git a/test/confs/3462 b/test/confs/3462 index 10b6cb952..75385a029 100644 --- a/test/confs/3462 +++ b/test/confs/3462 @@ -2,14 +2,9 @@ SERVER = -exim_path = EXIM_PATH -keep_environment = -host_lookup_order = bydns +.include DIR/aux-var/tls_conf_prefix + 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 ----- @@ -21,11 +16,7 @@ queue_only queue_run_in_order 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 ----- @@ -64,7 +55,7 @@ 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 @@ -72,9 +63,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 = * + tls_verify_certificates = DIR/aux-fixed/cert1 + tls_verify_cert_hostnames = : # ----- Retry -----