Add $connection_id variable

[exim.git] / test / confs / 2120

diff --git a/test/confs/2120 b/test/confs/2120
index e3a0ba1afef4080c62cf83329326e66d3f5adbfe..79a2e43f0ba6fcadbaea72db4163ca9493673818 100644 (file)
--- a/test/confs/2120
+++ b/test/confs/2120
@@ -2,14 +2,9 @@
 
 SERVER=
 
 
 SERVER=
 

-exim_path = EXIM_PATH
-keep_environment =
-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 -----
 


@@ -18,10 +13,12 @@ acl_smtp_rcpt = accept
 log_selector = +tls_peerdn
 
 queue_only
 log_selector = +tls_peerdn
 
 queue_only

-queue_run_in_order

 
 tls_advertise_hosts = *
 
 
 tls_advertise_hosts = *
 

+# Ciphers string needing normalisation (the underbar)
+tls_require_ciphers = ECDHE_RSA-AES256-SHA
+

 
 # ----- Routers -----
 
 
 # ----- Routers -----
 


@@ -38,9 +35,10 @@ 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

+  hosts_try_fastopen = :

 
 
 # ----- Retry -----
 
 
 # ----- Retry -----