Merge branch 'master' into 4.next

[exim.git] / test / confs / 0025

diff --git a/test/confs/0025 b/test/confs/0025
index f17e0d5b2f27be23dd00cba20dcdace73c99f413..3ecc5dd6898a1b6377d1826ed0afd8162b24498b 100644 (file)
--- a/test/confs/0025
+++ b/test/confs/0025
@@ -1,12 +1,8 @@
 # Exim test configuration 0025
 
 # Exim test configuration 0025
 

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