Logging: expand hosts_connection_nolog coverage

[exim.git] / test / confs / 2125

diff --git a/test/confs/2125 b/test/confs/2125
index 767bb1c4fc724d2f2ec676ff5617ca79d252f686..91b5283b2754ff3ea7d575cf3949127c797b65f2 100644 (file)
--- a/test/confs/2125
+++ b/test/confs/2125
@@ -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 -----
 
@@ -23,13 +18,12 @@ queue_run_in_order
 tls_advertise_hosts = *
 
 tls_require_ciphers = ${if eq{$sender_host_address}{HOSTIPV4}\
-                      {AES}{!AES:3DES}}
-
-# 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}
+                      {AES256}{AES128}}
+tls_certificate = DIR/aux-fixed/cert1
 
+.ifdef _OPT_OPENSSL_NO_TLSV1_3_X
+openssl_options = +no_tlsv1_3
+.endif
 
 # ----- Routers -----
 
@@ -50,10 +44,12 @@ send_to_server:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4 : 127.0.0.1
-  hosts_require_tls = HOSTIPV4
-  tls_require_ciphers = DES-CBC3-SHA
   port = PORT_D
-  tls_try_verify_hosts = :
+  hosts_require_tls = HOSTIPV4
+  tls_require_ciphers = AES128-SHA
+  hosts_try_fastopen = :
+  tls_verify_certificates = DIR/aux-fixed/cert1
+  tls_verify_cert_hostnames = :
 
 
 # ----- Retry -----