Logging: connection_id

[exim.git] / test / confs / 2025

diff --git a/test/confs/2025 b/test/confs/2025
index fdf1e04057ad2e707267b6c2453e99ed6110f65f..5ddeb75738bc7605110ae2a41f4991f2145dcf50 100644 (file)
--- a/test/confs/2025
+++ b/test/confs/2025
@@ -16,13 +16,8 @@ queue_only
 queue_run_in_order
 
 tls_advertise_hosts = *
 queue_run_in_order
 
 tls_advertise_hosts = *

-

 tls_require_ciphers = NORMAL:-VERS-ALL:+VERS-TLS1.2:-MAC-ALL:+SHA256
 tls_require_ciphers = NORMAL:-VERS-ALL:+VERS-TLS1.2:-MAC-ALL:+SHA256

-
-# 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 -----
 
 
 # ----- Routers -----


@@ -45,6 +40,7 @@ send_to_server:
   allow_localhost
   hosts = HOSTIPV4 : 127.0.0.1
   port = PORT_D
   allow_localhost
   hosts = HOSTIPV4 : 127.0.0.1
   port = PORT_D

+  hosts_try_fastopen = :

   hosts_require_tls = HOSTIPV4
   tls_require_ciphers = NORMAL:-VERS-ALL:+VERS-TLS1.2:-MAC-ALL:+SHA\
         ${if eq{$host}{HOSTIPV4} {384} {256} }
   hosts_require_tls = HOSTIPV4
   tls_require_ciphers = NORMAL:-VERS-ALL:+VERS-TLS1.2:-MAC-ALL:+SHA\
         ${if eq{$host}{HOSTIPV4} {384} {256} }