X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/28a169c6cdc03bfab1240724eae05ec061d22b20..ee549a2ed04164407f4f897be3bf545f32579c5c:/test/confs/2132 diff --git a/test/confs/2132 b/test/confs/2132 index 11dc3ce21..3a0614d8e 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,17 +29,7 @@ begin acl check_recipient: accept hosts = : deny hosts = HOSTIPV4 - !encrypted = AES256-SHA : \ - AES256-GCM-SHA384 : \ - AES128-GCM-SHA256 : \ - 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 : \ - ECDHE-RSA-AES256-GCM-SHA384 : \ - ECDHE-RSA-AES128-GCM-SHA256 + !encrypted = * warn logwrite = ${if def:tls_in_ourcert \ {Our cert SN: <${certextract{subject}{$tls_in_ourcert}}>} \ {We did not present a cert}} @@ -70,6 +56,7 @@ begin transports local_delivery: driver = appendfile file = DIR/test-mail/$local_part + create_file = DIR/test-mail headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER