Merge from master into 4.next

[exim.git] / test / confs / 2029

diff --git a/test/confs/2029 b/test/confs/2029
index 1d691be27234304904c59e3a36d494d15c1c97bd..40c56f0c2cd0cf37b10edb6ee7d3adef44b749be 100644 (file)
--- a/test/confs/2029
+++ b/test/confs/2029
@@ -1,13 +1,8 @@
 # Exim test configuration 2029
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----