Merge from master into 4.next

[users/heiko/exim.git] / test / confs / 2115

diff --git a/test/confs/2115 b/test/confs/2115
index 8142100aaee5d35a321af0d62f02334e6fab4288..ab1f6dcdd40098d365532513c74274d0e57e3fa9 100644 (file)
--- a/test/confs/2115
+++ b/test/confs/2115
@@ -1,12 +1,8 @@
 # Exim test configuration 2115
 
-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 -----