Merge from master into 4.next

[exim.git] / test / confs / 2025

diff --git a/test/confs/2025 b/test/confs/2025
index ccb56dcb29cb7b5d1d4fdf6315fed7878955649e..feaa815a1d3213628618df8c78e25623a1878850 100644 (file)
--- a/test/confs/2025
+++ b/test/confs/2025
@@ -2,13 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----