Merge from master into 4.next

[exim.git] / test / confs / 2104

diff --git a/test/confs/2104 b/test/confs/2104
index 610a5b722b3b2954ba0ce92c210a56d979a7cc04..7cd35f0e27b74a9324d0da4c8fb1c2d05a3cf9bb 100644 (file)
--- a/test/confs/2104
+++ b/test/confs/2104
@@ -1,12 +1,8 @@
 # Exim test configuration 2104
 
-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 -----