X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/d29a84b5fb514671b2b6a324ebb5f982dfcfc812..980b106561b5b7ad9dd4c501d05a4f9083ef7417:/test/confs/0900?ds=inline diff --git a/test/confs/0900 b/test/confs/0900 index e02380f73..caf17be81 100644 --- a/test/confs/0900 +++ b/test/confs/0900 @@ -13,6 +13,12 @@ gecos_pattern = "" gecos_name = CALLER_NAME chunking_advertise_hosts = * tls_advertise_hosts = ${if eq {SRV}{tls} {*}} +.ifdef _HAVE_REQTLS +tls_advertise_requiretls = : +.endif +.ifdef _HAVE_PIPE_CONNECT +pipelining_connect_advertise_hosts = : +.endif # ----- Main settings ----- @@ -26,7 +32,12 @@ 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} @@ -59,7 +70,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: @@ -104,7 +115,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 @@ -112,6 +124,7 @@ remote_smtp_dkim: dkim_sign_headers = LIST .endif .endif +.endif # ----- Retry -----