Fix ${readsocket } eol-replacement. Bug 2630

[exim.git] / test / confs / 2108

diff --git a/test/confs/2108 b/test/confs/2108
index a32e7e46ad5b5673f0b856261a8b8b03beb0c39a..c9720e46a35a66206bd3627a3936357107225ecd 100644 (file)
--- a/test/confs/2108
+++ b/test/confs/2108
@@ -2,15 +2,9 @@
 
 SERVER =
 
 
 SERVER =
 

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

 
 

+primary_hostname = myhost.test.ex

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


@@ -28,7 +22,6 @@ tls_advertise_hosts = *
 
 tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
 
 
 tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
 

-

 # ------ ACL ------
 
 begin acl
 # ------ ACL ------
 
 begin acl


@@ -60,7 +53,7 @@ begin transports
 
 local_delivery:
   driver = appendfile
 
 local_delivery:
   driver = appendfile

-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}

   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 


@@ -69,6 +62,7 @@ send_to_server1:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D

+  hosts_try_fastopen = :

   helo_data = helo.data.changed
 
 send_to_server2:
   helo_data = helo.data.changed
 
 send_to_server2:


@@ -76,6 +70,7 @@ send_to_server2:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D

+  hosts_try_fastopen = :

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