Merge branch 'master' into 4.next

[exim.git] / test / confs / 4000

diff --git a/test/confs/4000 b/test/confs/4000
index bc4ccd8fd0dd9c4834aa870ddf6229edb0b5cb55..c8ad7f8aa310f832debcb9d2ea8566f2f41e3d4e 100644 (file)
--- a/test/confs/4000
+++ b/test/confs/4000
@@ -1,15 +1,9 @@
 # Exim test configuration 4000
 
 # Exim test configuration 4000
 

-exim_path = EXIM_PATH
-keep_environment =
-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
 log_selector = +subject

-tls_advertise_hosts =
+primary_hostname = myhost.test.ex

 
 
 # ----- Main settings -----
 
 
 # ----- Main settings -----