Merge from master into 4.next

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

diff --git a/test/confs/2118 b/test/confs/2118
index 7ddc16140aebc3ad58dc7affa918000c780be63f..d3e77201d1ac48a577adcb43df53d64f66466ca2 100644 (file)
--- a/test/confs/2118
+++ b/test/confs/2118
@@ -1,12 +1,8 @@
 # Exim test configuration 2118
 
 # Exim test configuration 2118
 

-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/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----