Merge from master into 4.next

[exim.git] / test / confs / 2005

diff --git a/test/confs/2005 b/test/confs/2005
index 5b57b60ffc535a58a2ecd9ccc3eae2686ec45de1..110bbef22402507600120172c35a31ba8790e2b8 100644 (file)
--- a/test/confs/2005
+++ b/test/confs/2005
@@ -1,12 +1,8 @@
 # Exim test configuration 2005
 
-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/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----