Merge from master into 4.next

[exim.git] / test / confs / 2110

diff --git a/test/confs/2110 b/test/confs/2110
index db6864863901eae85ebde81959d1e4b185828d5d..72754a6d9fccc62ea2fe3b80675a68c83ad3e38b 100644 (file)
--- a/test/confs/2110
+++ b/test/confs/2110
@@ -3,13 +3,9 @@
 SERVER =
 HOSTS = 127.0.0.1 : HOSTIPV4
 
-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 -----