Merge from master into 4.next

[exim.git] / test / confs / 5651

diff --git a/test/confs/5651 b/test/confs/5651
index f09df575b02decd9ad12ccaa84eb5004e723a112..5803c3ce9e3706de2dd2e4466b9cf6f6eab7132e 100644 (file)
--- a/test/confs/5651
+++ b/test/confs/5651
@@ -3,15 +3,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = server1.example.com
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/tls_conf_prefix
 
+primary_hostname = server1.example.com
 
 # ----- Main settings -----
 
@@ -35,7 +29,7 @@ tls_privatekey = ${if eq {SERVER}{server}\
 fail}
 
 # from cmdline define
-tls_ocsp_file = OCSP
+tls_ocsp_file = OPT
 
 
 # ------ ACL ------