Merge branch 'master' into 4.next

[exim.git] / test / confs / 0200

diff --git a/test/confs/0200 b/test/confs/0200
index 1c6e9f675d1c22339b5812e91e36336421306c2a..ab50f36dfbf1280fa1c35732cd7399669ee9bfb7 100644 (file)
--- a/test/confs/0200
+++ b/test/confs/0200
@@ -1,14 +1,8 @@
 # Exim test configuration 0200
 
 # Exim test configuration 0200
 

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

 primary_hostname = myhost.test.ex
 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 -----
 
 
 # ----- Main settings -----