X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/610ff4388b33ddc2753c17eefb8b03e2fdd7e124..ee359040f0c1e78c057bb1e533059c5c3d9e2c69:/test/confs/2117

diff --git a/test/confs/2117 b/test/confs/2117
index ab809d081..16429f1a4 100644
--- a/test/confs/2117
+++ b/test/confs/2117
@@ -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
 
 
 # ----- Routers -----
@@ -50,7 +41,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
 
@@ -58,9 +49,11 @@ send_to_server:
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1
-  hosts_nopass_tls = *
   port = PORT_D
-  tls_try_verify_hosts = :
+  hosts_try_fastopen = :
+  tls_verify_certificates = DIR/aux-fixed/cert1
+  tls_verify_cert_hostnames = :
+  hosts_nopass_tls = *
 
 
 # ----- Retry -----