Merge from master into 4.next

[exim.git] / test / confs / 0512

diff --git a/test/confs/0512 b/test/confs/0512
index 202acb29fd86f3f92c9cf90c31f5fdbb0bd151e0..15e424a5139ede6cc8fc44d4fa0b6203b8072ee2 100644 (file)
--- a/test/confs/0512
+++ b/test/confs/0512
@@ -2,14 +2,9 @@
 
 HARDLIMIT=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----