X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/038597d295fa0ebd48ed4c00a6dfff0f30a2353a..e4a04f2a8de013abe125d9d04219343b0a32662e:/test/confs/2119 diff --git a/test/confs/2119 b/test/confs/2119 index 3714f97c6..64987c8c0 100644 --- a/test/confs/2119 +++ b/test/confs/2119 @@ -1,12 +1,8 @@ # Exim test configuration 2119 -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,16 +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-AES128-GCM-SHA256 + !encrypted = * accept @@ -62,7 +49,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