Merge from master into 4.next

[exim.git] / test / confs / 0029

diff --git a/test/confs/0029 b/test/confs/0029
index d0c6708192d812faeea3a3b653f3c1cfc9f5e45c..09e77963fc034e7ae17396aeaf72f240b51d8f68 100644 (file)
--- a/test/confs/0029
+++ b/test/confs/0029
@@ -1,13 +1,8 @@
 # Exim test configuration 0029
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_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 -----