X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/6acd9fcf8454b0a18065bcd6ee865c5ddc82e44d..1935b47f7c6dfadfb9146b220a62c037b0f4f75c:/test/confs/0900 diff --git a/test/confs/0900 b/test/confs/0900 index 2eaf01ee3..df1540cfb 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,16 @@ 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} {*}} +.ifdef _HAVE_REQTLS +tls_advertise_requiretls = : +.endif +.ifdef _HAVE_PIPE_CONNECT +pipelining_connect_advertise_hosts = : +.endif +.ifdef _HAVE_DMARC +dmarc_tld_file = +.endif # ----- Main settings ----- @@ -26,10 +35,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 +66,6 @@ check_data: warn message = X-acl-message-linecount: $message_linecount accept - # ----- Routers ----- begin routers @@ -58,7 +73,7 @@ begin routers to_server: driver = accept condition = ${if !eq {SERVER}{server}} - transport = remote_smtp${if eq {OPT}{dkim} {_dkim}} + transport = remote_smtp${if eq {SRV}{dkim} {_dkim}} errors_to = "" fail_remote_domains: @@ -81,7 +96,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = "X-body-linecount: $body_linecount\n\ X-message-linecount: $message_linecount\n\ X-received-count: $received_count" @@ -91,6 +106,7 @@ remote_smtp: driver = smtp hosts = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : allow_localhost command_timeout = 2s final_timeout = 2s @@ -99,11 +115,13 @@ remote_smtp_dkim: driver = smtp hosts = 127.0.0.1 port = PORT_S + hosts_try_fastopen = : allow_localhost command_timeout = 2s final_timeout = 2s -.ifdef OPT +.ifdef _HAVE_DKIM +.ifdef SRV dkim_domain = test.ex dkim_selector = sel dkim_private_key = DIR/aux-fixed/dkim/dkim.private @@ -111,6 +129,7 @@ remote_smtp_dkim: dkim_sign_headers = LIST .endif .endif +.endif # ----- Retry -----