Merge from master into 4.next

[exim.git] / test / confs / 0155

diff --git a/test/confs/0155 b/test/confs/0155
index b51837c4d93c5628f63b130a21a641a17e6039b5..a85ebe5d79c6c9f473a038b1537e530f50e0fe69 100644 (file)
--- a/test/confs/0155
+++ b/test/confs/0155
@@ -1,12 +1,7 @@
 # Exim test configuration 0155
 
-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 -----