From 4fab92fbc2b63bac2d89c1dae69fa1845cb640b7 Mon Sep 17 00:00:00 2001
From: "Heiko Schlittermann (HS12-RIPE)" <hs@schlittermann.de>
Date: Fri, 25 Nov 2016 11:23:26 +0100
Subject: Merge from master into 4.next

Done with git merge --squash -x theirs master
---
 test/confs/2005 | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'test/confs/2005')

diff --git a/test/confs/2005 b/test/confs/2005
index 5b57b60ff..110bbef22 100644
--- a/test/confs/2005
+++ b/test/confs/2005
@@ -1,12 +1,8 @@
 # Exim test configuration 2005
 
-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 -----
 
-- 
cgit v1.2.3