X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/a08c49f10dbed682e0500e6510c78bd65002fc34..46694b802ce0302f3c3344be933cc9737d4d4f4c:/test/confs/2132 diff --git a/test/confs/2132 b/test/confs/2132 index 896166443..7329e28d1 100644 --- a/test/confs/2132 +++ b/test/confs/2132 @@ -1,12 +1,8 @@ # Exim test configuration 2132 (close copy of 2102) -exim_path = EXIM_PATH -host_lookup_order = bydns +.include DIR/aux-var/tls_conf_prefix + primary_hostname = myhost.test.ex -spool_directory = DIR/spool -log_file_path = DIR/spool/log/%slog -gecos_pattern = "" -gecos_name = CALLER_NAME # ----- Main settings ----- @@ -33,14 +29,7 @@ begin acl check_recipient: accept hosts = : deny hosts = HOSTIPV4 - !encrypted = AES256-SHA : \ - AES256-GCM-SHA384 : \ - IDEA-CBC-MD5 : \ - DES-CBC3-SHA : \ - DHE-RSA-AES256-SHA : \ - DHE-RSA-AES256-GCM-SHA384 : \ - DHE_RSA_AES_256_CBC_SHA1 : \ - DHE_RSA_3DES_EDE_CBC_SHA + !encrypted = * warn logwrite = ${if def:tls_in_ourcert \ {Our cert SN: <${certextract{subject}{$tls_in_ourcert}}>} \ {We did not present a cert}} @@ -66,7 +55,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