X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/bfe645c1570343d3adca657ab67998e122ca8792..600dc06981df5a906125f8442c36056a117412d4:/test/confs/4221 diff --git a/test/confs/4221 b/test/confs/4221 index 085fecc72..d146ecfdf 100644 --- a/test/confs/4221 +++ b/test/confs/4221 @@ -4,12 +4,7 @@ OPTION = * CONTROL = -exim_path = EXIM_PATH -host_lookup_order = bydns -spool_directory = DIR/spool -log_file_path = DIR/spool/log/%slog -gecos_pattern = "" -gecos_name = CALLER_NAME +.include DIR/aux-var/tls_conf_prefix # ----- Main settings ----- @@ -26,9 +21,8 @@ queue_only queue_run_in_order .endif -tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} -tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} tls_advertise_hosts = * +tls_certificate = DIR/aux-fixed/cert1 smtputf8_advertise_hosts = OPTION @@ -113,14 +107,18 @@ local_delivery: delivery_date_add envelope_to_add file = DIR/test-mail/$local_part + create_file = DIR/test-mail headers_add = "X-body-linecount: $body_linecount\n\ X-message-linecount: $message_linecount\n\ X-received-count: $received_count" return_path_add rmt_smtp: - driver = smtp - hosts_require_tls = * - tls_try_verify_hosts = : + driver = smtp + hosts_try_fastopen = : + hosts_require_tls = * + tls_verify_certificates = DIR/aux-fixed/cert1 + tls_verify_cert_hostnames = : + utf8_downconvert = 0 # End