Merge branch 'master' into 4.next

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

diff --git a/test/confs/5000 b/test/confs/5000
index 7925a61f158ca08ea2e5a0f6d90fac7cbafb19a4..e3328c6a166c1268d26d8c214a8ab1e104d8f75c 100644 (file)
--- a/test/confs/5000
+++ b/test/confs/5000
@@ -1,14 +1,8 @@
 # Exim test configuration 5000
 
-exim_path = EXIM_PATH
-keep_environment =
-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 -----