Merge from master into 4.next

[users/jgh/exim.git] / test / confs / 2013

diff --git a/test/confs/2013 b/test/confs/2013
index 331dd09ef3f50e2bea92900c3e462c9c017785b2..ebd2536915c5eb5a0e5ef9a1382ccc0220b0ad36 100644 (file)
--- a/test/confs/2013
+++ b/test/confs/2013
@@ -2,13 +2,9 @@
 
 SERVER =
 
 
 SERVER =
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+

 primary_hostname = myhost.test.ex
 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 -----
 
 
 # ----- Main settings -----