X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=test%2Fconfs%2F2108;h=c9720e46a35a66206bd3627a3936357107225ecd;hb=40bffa31bd7057a0e88e29bb76fa63382d4aa1bc;hp=0388d0cc685b2095cd9d130ce8260ddd8e1d8e35;hpb=a08c49f10dbed682e0500e6510c78bd65002fc34;p=exim.git diff --git a/test/confs/2108 b/test/confs/2108 index 0388d0cc6..c9720e46a 100644 --- a/test/confs/2108 +++ b/test/confs/2108 @@ -2,14 +2,9 @@ SERVER = -exim_path = EXIM_PATH -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 ----- @@ -27,7 +22,6 @@ tls_advertise_hosts = * tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} - # ------ ACL ------ begin acl @@ -59,7 +53,7 @@ begin transports 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 @@ -68,6 +62,7 @@ send_to_server1: allow_localhost hosts = 127.0.0.1 port = PORT_D + hosts_try_fastopen = : helo_data = helo.data.changed send_to_server2: @@ -75,6 +70,7 @@ send_to_server2: allow_localhost hosts = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : # ----- Retry -----