Merge from master into 4.next

[users/jgh/exim.git] / test / confs / 0154

diff --git a/test/confs/0154 b/test/confs/0154
index 84ed47d7d947b607a48f626f4f938be2aa3f36b6..bc5ffb89989413321358b753d48a5a70b3fbd442 100644 (file)
--- a/test/confs/0154
+++ b/test/confs/0154
@@ -1,12 +1,7 @@
 # Exim test configuration 0154
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----