Merge from master into 4.next

[users/jgh/exim.git] / test / confs / 0529

diff --git a/test/confs/0529 b/test/confs/0529
index 282047f9f53f1a959b4e26a1f57e9a5d22c52f89..09e81d06e0368c0325202a9dbd5b45450960b859 100644 (file)
--- a/test/confs/0529
+++ b/test/confs/0529
@@ -1,13 +1,8 @@
 # Exim test configuration 0529
 
 # Exim test configuration 0529
 

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