Merge from master into 4.next

[exim.git] / test / confs / 0054

diff --git a/test/confs/0054 b/test/confs/0054
index 13ca588a459bcecfa36914c438726ece568c3f21..3ad8751572a12c02b753ab0c7abd4d5e8efa6cce 100644 (file)
--- a/test/confs/0054
+++ b/test/confs/0054
@@ -1,14 +1,9 @@
 # Exim test configuration 0054
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.ex
-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
+
 trusted_users = CALLER
+primary_hostname = myhost.ex
 
 # ----- Main settings -----