X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/f926e27276301de1e2fd011b7edcd1b85d8c4754..b38a477da0a5248ed1d2b7590922c89c6337ec3b:/test/confs/2014 diff --git a/test/confs/2014 b/test/confs/2014 index 562e916fd..ec7c0011f 100644 --- a/test/confs/2014 +++ b/test/confs/2014 @@ -2,13 +2,9 @@ CRL= -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 ----- @@ -26,7 +22,7 @@ tls_privatekey = DIR/aux-fixed/cert1 tls_verify_hosts = HOSTIPV4 tls_try_verify_hosts = * -tls_verify_certificates = DIR/aux-fixed/cert2 +tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem tls_crl = CRL @@ -35,7 +31,7 @@ tls_crl = CRL begin acl check_recipient: - deny message = certificate not verified: peerdn=$tls_peerdn + deny message = certificate not verified: peerdn=$tls_in_peerdn ! verify = certificate accept @@ -56,8 +52,8 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part - headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn + file = DIR/test-mail/${bless:$local_part} + headers_add = TLS: cipher=$tls_cipher peerdn=$tls_in_peerdn user = CALLER # End