X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/0509be3542344cf27658df9935d930cb2d2b9560..46694b802ce0302f3c3344be933cc9737d4d4f4c:/test/confs/2113

diff --git a/test/confs/2113 b/test/confs/2113
index d5be24861..b992747e2 100644
--- a/test/confs/2113
+++ b/test/confs/2113
@@ -1,21 +1,17 @@
 # Exim test configuration 2113
 
 SERVER =
+PEX = :
+
+.include DIR/aux-var/tls_conf_prefix
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
 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
 
-log_selector = +tls_peerdn+smtp_connection+incoming_port
+log_selector = +tls_peerdn+smtp_connection+incoming_port+received_recipients
 
 queue_only
 queue_run_in_order
@@ -24,16 +20,22 @@ smtp_accept_max_nonmail = 0
 
 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 -----
 
 begin routers
 
+.ifdef REQUIRE
+cl_override:
+  driver = manualroute
+  route_data = HOSTIPV4
+  retry_use_local_part
+  transport = send_to_server
+  self = send
+.endif
+
 client:
   driver = accept
   condition = ${if eq {SERVER}{server}{no}{yes}}
@@ -52,15 +54,19 @@ 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
 
 send_to_server:
   driver = smtp
   allow_localhost
+  hosts_override
   hosts = 127.0.0.1
   port = PORT_D
-  tls_try_verify_hosts = :
+  hosts_try_fastopen =	:
+  hosts_noproxy_tls = PEX
+  tls_verify_certificates = DIR/aux-fixed/cert1
+  tls_verify_cert_hostnames = :
 
 # End