Merge from master into 4.next

[exim.git] / test / confs / 2123

diff --git a/test/confs/2123 b/test/confs/2123
index 6170caaa82b9d665d2fd6a3bae56ff0217f03c11..8c89e9aae0e59727ff3cd1e51a4f20ace15ca200 100644 (file)
--- a/test/confs/2123
+++ b/test/confs/2123
@@ -1,12 +1,8 @@
 # Exim test configuration 2123
 
-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/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----