Merge from master into 4.next

[exim.git] / test / confs / 2000

diff --git a/test/confs/2000 b/test/confs/2000
index 7a2d34b2f2cfd5a2088f56ab380e299ca3f705df..9ca325f2a27e49cc5093245e09cfff8883109a4c 100644 (file)
--- a/test/confs/2000
+++ b/test/confs/2000
@@ -2,13 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 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 -----