X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/0509be3542344cf27658df9935d930cb2d2b9560..3cee6033bae86d254e51b583d34f6b559a6d95ea:/test/confs/2149?ds=inline

diff --git a/test/confs/2149 b/test/confs/2149
index cf67f8cbc..1782391de 100644
--- a/test/confs/2149
+++ b/test/confs/2149
@@ -2,26 +2,20 @@
 
 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 -----
 
 acl_smtp_rcpt = accept
 
-queue_only
-queue_run_in_order
+tls_advertise_hosts =	*
+tls_certificate =	DIR/aux-fixed/cert1
 
-tls_advertise_hosts = *
-tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
-tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
-tls_dhparam = ${if eq {SERVER}{server}{DIR/aux-fixed/dh1}fail}
+.ifdef DATA
+tls_eccurve =		DATA
+.endif
 
 
 # ----- Routers -----
@@ -29,32 +23,28 @@ tls_dhparam = ${if eq {SERVER}{server}{DIR/aux-fixed/dh1}fail}
 begin routers
 
 client:
-  driver = accept
-  condition = ${if eq {SERVER}{server}{no}{yes}}
+  driver =	accept
+  condition =	${if eq {SERVER}{server}{no}{yes}}
   retry_use_local_part
-  transport = send_to_server
+  transport =	send_to_server
+  errors_to =	""
 
 server:
-  driver = accept
-  retry_use_local_part
-  transport = local_delivery
-
+  driver =	redirect
+  data =	:blackhole:
 
 # ----- Transports -----
 
 begin transports
 
-local_delivery:
-  driver = appendfile
-  file = DIR/test-mail/$local_part
-  headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
-  user = CALLER
-
 send_to_server:
-  driver = smtp
+  driver =	smtp
   allow_localhost
-  hosts = 127.0.0.1
-  port = PORT_D
-  tls_try_verify_hosts = :
+  hosts =	127.0.0.1
+  port =	PORT_D
+  hosts_try_fastopen =		:
+  tls_verify_certificates =	DIR/aux-fixed/cert1
+  tls_verify_cert_hostnames =	:
+  hosts_require_tls =		*
 
 # End