Merge from master into 4.next

[exim.git] / test / confs / 0204

diff --git a/test/confs/0204 b/test/confs/0204
index fa0400a91b003422c88d6b30bf067916b78e7112..138dbe0a12b1c57a08983ac53279d9ba0e66bf68 100644 (file)
--- a/test/confs/0204
+++ b/test/confs/0204
@@ -1,13 +1,8 @@
 # Exim test configuration 0204
 
 # Exim test configuration 0204
 

-exim_path = EXIM_PATH
-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 -----