Merge from master into 4.next

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

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