Merge from master into 4.next

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

diff --git a/test/confs/2120 b/test/confs/2120
index c0225e81983be715a47910973c9dd2ffe9a95824..1288d7f128ece2246814dcfed568b2cc82324c8a 100644 (file)
--- a/test/confs/2120
+++ b/test/confs/2120
@@ -2,13 +2,9 @@
 
 SERVER=
 
 
 SERVER=
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
+.include DIR/aux-var/tls_conf_prefix
+
+primary_hostname = thishost.test.ex

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


@@ -37,7 +33,7 @@ begin transports
 
 t1:
   driver = smtp
 
 t1:
   driver = smtp

-  hosts = 127.0.0.1
+  hosts = thishost.test.ex

   allow_localhost
   port = PORT_D
 
   allow_localhost
   port = PORT_D