MySQL, pgsql: per-query server options outside the lookup string. Bug 2546

[exim.git] / test / confs / 2000

diff --git a/test/confs/2000 b/test/confs/2000
index 06e5a153cab4558f1a2b0ea2d98e244f05d217ca..11104b09da346d44a68b89f43d9937d81814f96a 100644 (file)
--- a/test/confs/2000
+++ b/test/confs/2000
@@ -2,14 +2,9 @@
 
 SERVER=
 
 
 SERVER=
 

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

 primary_hostname = myhost.test.ex
 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 -----
 
 
 # ----- Main settings -----
 


@@ -53,9 +48,11 @@ send_to_server:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D

+  hosts_try_fastopen = :

   tls_certificate = DIR/aux-fixed/cert2
   tls_privatekey = DIR/aux-fixed/cert2
   tls_verify_certificates = DIR/aux-fixed/cert2
   tls_certificate = DIR/aux-fixed/cert2
   tls_privatekey = DIR/aux-fixed/cert2
   tls_verify_certificates = DIR/aux-fixed/cert2

+  tls_try_verify_hosts =

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