X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/6acd9fcf8454b0a18065bcd6ee865c5ddc82e44d..d9acfc1ce677f0bfd16f1555f3762af13b8e5a7b:/test/confs/0900?ds=inline diff --git a/test/confs/0900 b/test/confs/0900 index 2eaf01ee3..ce6f2c379 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: @@ -103,7 +118,8 @@ remote_smtp_dkim: 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 +127,7 @@ remote_smtp_dkim: dkim_sign_headers = LIST .endif .endif +.endif # ----- Retry -----