Merge from master into 4.next

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

diff --git a/test/confs/4000 b/test/confs/4000
index f5c2d396171bad994b1e266d988f5a8a8248ac09..c8ad7f8aa310f832debcb9d2ea8566f2f41e3d4e 100644 (file)
--- a/test/confs/4000
+++ b/test/confs/4000
@@ -1,14 +1,9 @@
 # Exim test configuration 4000
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+
 log_selector = +subject
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 
 # ----- Main settings -----