tidying

[users/heiko/exim.git] / test / confs / 2130

diff --git a/test/confs/2130 b/test/confs/2130
index 4afded1cf2e7e1320ee95c94554494c59d0e184c..0559bba538d9d3e9db3615267e22395611494b0a 100644 (file)
--- a/test/confs/2130
+++ b/test/confs/2130
@@ -16,10 +16,7 @@ log_selector = +tls_peerdn +tls_sni
 remote_max_parallel = 1
 
 tls_advertise_hosts = *
 remote_max_parallel = 1
 
 tls_advertise_hosts = *

-
-# Set certificate only if server
-
-tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
+tls_certificate = DIR/aux-fixed/cert1

 
 
 # ------ ACL ------
 
 
 # ------ ACL ------


@@ -55,7 +52,8 @@ send_to_server1:
   port = PORT_D
   hosts_try_fastopen = :
   tls_sni = fred
   port = PORT_D
   hosts_try_fastopen = :
   tls_sni = fred

-  tls_try_verify_hosts = :
+  tls_verify_certificates = DIR/aux-fixed/cert1
+  tls_verify_cert_hostnames = :

 
 send_to_server2:
   driver = smtp
 
 send_to_server2:
   driver = smtp


@@ -63,7 +61,8 @@ send_to_server2:
   hosts = HOSTIPV4
   port = PORT_D
   hosts_try_fastopen = :
   hosts = HOSTIPV4
   port = PORT_D
   hosts_try_fastopen = :

-  tls_try_verify_hosts = :
+  tls_verify_certificates = DIR/aux-fixed/cert1
+  tls_verify_cert_hostnames = :

 
 
 # ----- Retry -----
 
 
 # ----- Retry -----