Merge branch 'master' into 4.next

[exim.git] / test / confs / 0525

diff --git a/test/confs/0525 b/test/confs/0525
index bab0c6620d07e9e40d3ebbd2ed8bee11c52bcf54..a6e429172bc08c5bd6e70de21e6650a5c49f24c9 100644 (file)
--- a/test/confs/0525
+++ b/test/confs/0525
@@ -1,12 +1,8 @@
 # Exim test configuration 0525
 
 # Exim test configuration 0525
 

-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

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