Merge branch 'master' into 4.next

[exim.git] / test / confs / 3000

diff --git a/test/confs/3000 b/test/confs/3000
index 4b41aab70e7a40730179cd9008c8817f3a700317..9789808fbe7dd1e205d56228e787afdcfde3fb4d 100644 (file)
--- a/test/confs/3000
+++ b/test/confs/3000
@@ -1,15 +1,9 @@
 # Exim test configuration 3000
 
 # Exim test configuration 3000
 

-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+

 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex

-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =

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