X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/6acd9fcf8454b0a18065bcd6ee865c5ddc82e44d..7a128512684cd0ece3d4dde369ebc5b7af360f06:/test/confs/0900?ds=inline diff --git a/test/confs/0900 b/test/confs/0900 index 2eaf01ee3..9a856899a 100644 --- a/test/confs/0900 +++ b/test/confs/0900 @@ -1,6 +1,6 @@ # Exim test configuration 0900 SERVER= -Y= +SRV= LIST= ALLOW= @@ -12,7 +12,7 @@ log_file_path = DIR/spool/log/SERVER%slog gecos_pattern = "" gecos_name = CALLER_NAME chunking_advertise_hosts = * -tls_advertise_hosts = ${if eq {Y}{tls} {*}} +tls_advertise_hosts = ${if eq {SRV}{tls} {*}} # ----- Main settings ----- @@ -26,10 +26,17 @@ acl_smtp_data = check_data trusted_users = CALLER queue_only smtp_receive_timeout = 2s + +.ifdef _HAVE_DKIM +log_selector = +received_recipients +dkim_verbose +.else log_selector = +received_recipients +.endif +.ifdef _OPT_MAIN_TLS_CERTIFICATE tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} +.endif ALLOW @@ -50,7 +57,6 @@ check_data: warn message = X-acl-message-linecount: $message_linecount accept - # ----- Routers ----- begin routers