X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=test%2Fconfs%2F3462;h=75385a029bca552d78cd5007949de74e50ad19b1;hb=e8fd2c45ddd6f59f159baaa2c154ced5ce36f3df;hp=3907aecef51265ab97138b7dc358eda056b37d68;hpb=610ff4388b33ddc2753c17eefb8b03e2fdd7e124;p=user%2Fhenk%2Fcode%2Fexim.git diff --git a/test/confs/3462 b/test/confs/3462 index 3907aecef..75385a029 100644 --- a/test/confs/3462 +++ b/test/confs/3462 @@ -2,14 +2,9 @@ SERVER = -exim_path = EXIM_PATH -host_lookup_order = bydns +.include DIR/aux-var/tls_conf_prefix + primary_hostname = myhost.test.ex -rfc1413_query_timeout = 0s -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 -----