Merge from master into 4.next

[exim.git] / test / confs / 0555

diff --git a/test/confs/0555 b/test/confs/0555
index 2dbfa9da11daec4e23439fa11c07b1c2f8db91fe..c86050fa6d69937fc02ca158591be1d4c4c72226 100644 (file)
--- a/test/confs/0555
+++ b/test/confs/0555
@@ -2,14 +2,9 @@
 
 FAKE=fakereject
 
-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 -----