Merge from master into 4.next

[users/heiko/exim.git] / test / confs / 2500

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