Merge branch '4.next'

[exim.git] / test / confs / 2001

diff --git a/test/confs/2001 b/test/confs/2001
index f1dc480789604dca704bbe06b506ed2012c2c3a0..d6525cae5e42f3d7535d4aaa96f47efccb26b06e 100644 (file)
--- a/test/confs/2001
+++ b/test/confs/2001
@@ -3,14 +3,9 @@
 OPTION=
 SERVER=
 
 OPTION=
 SERVER=
 

-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+

 primary_hostname = myhost.test.ex
 primary_hostname = myhost.test.ex

-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 


@@ -32,6 +27,9 @@ tls_verify_hosts = *
 tls_verify_certificates = ${if eq {SERVER}{server}{DIR/aux-fixed/cert2}fail}
 
 
 tls_verify_certificates = ${if eq {SERVER}{server}{DIR/aux-fixed/cert2}fail}
 
 

+# so we can decode in wireshark
+tls_require_ciphers = NORMAL:-KX-ALL:+RSA
+

 # ----- Routers -----
 
 begin routers
 # ----- Routers -----
 
 begin routers


@@ -51,6 +49,7 @@ send_to_server:
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1

+  hosts_try_fastopen = :

   OPTION
   port = PORT_D
   tls_certificate = DIR/aux-fixed/cert2
   OPTION
   port = PORT_D
   tls_certificate = DIR/aux-fixed/cert2