Merge from master into 4.next

[exim.git] / test / confs / 0612

diff --git a/test/confs/0612 b/test/confs/0612
index 3439ecb84b32a8f8a28bf3f2a408c9a7cc164016..44f2e74d6bc58cbf924d283183fc7994bc10a845 100644 (file)
--- a/test/confs/0612
+++ b/test/confs/0612
@@ -1,14 +1,9 @@
 # Exim test configuration 0612
 # log_defer_output on pipe transport
 
-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 -----