Merge from master into 4.next

[exim.git] / test / confs / 0146

diff --git a/test/confs/0146 b/test/confs/0146
index f2f0e26a3492ac11826508fedaa00f1ff6de0ff6..d8b6067e765e81fbd42ce304d739e8b4ee2e931d 100644 (file)
--- a/test/confs/0146
+++ b/test/confs/0146
@@ -1,14 +1,9 @@
 # Exim test configuration 0146
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
+.include DIR/aux-var/std_conf_prefix
+
 qualify_domain = test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----