Merge from master into 4.next

[exim.git] / test / confs / 0024

diff --git a/test/confs/0024 b/test/confs/0024
index 0d55784237d50100a2e459da35af520076e1ea3b..3dbbc2c258a464c2d2b13e130fa0fb02e898b56b 100644 (file)
--- a/test/confs/0024
+++ b/test/confs/0024
@@ -1,13 +1,8 @@
 # Exim test configuration 0024
 
 # Exim test configuration 0024
 

-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 -----