Merge from master into 4.next

[exim.git] / test / confs / 0500

diff --git a/test/confs/0500 b/test/confs/0500
index f07b208937b92b73f0bef3752bb34ada7666ba5e..f3b225c66f83ffac6a825c4156919da09603982b 100644 (file)
--- a/test/confs/0500
+++ b/test/confs/0500
@@ -1,13 +1,8 @@
 # Exim test configuration 0500
 
-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 -----