X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/0b20855c02c44cb79a33824596e3ad8dc906131f..fa287dc3638b0f282fba5302a0fc01ac07421f9f:/test/confs/0900?ds=sidebyside diff --git a/test/confs/0900 b/test/confs/0900 index 427669c4b..caf17be81 100644 --- a/test/confs/0900 +++ b/test/confs/0900 @@ -1,8 +1,7 @@ # Exim test configuration 0900 SERVER= -X= -Y= -OPT= +SRV= +LIST= ALLOW= exim_path = EXIM_PATH @@ -13,11 +12,18 @@ 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 # ----- Main settings ----- +primary_hostname = testhost.test.ex domainlist local_domains = @ : test.ex acl_smtp_rcpt = check_recipient @@ -26,10 +32,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 +63,6 @@ check_data: warn message = X-acl-message-linecount: $message_linecount accept - # ----- Routers ----- begin routers @@ -58,7 +70,7 @@ begin routers to_server: driver = accept condition = ${if !eq {SERVER}{server}} - transport = remote_smtp${if eq {X}{dkim} {_dkim}} + transport = remote_smtp${if eq {SRV}{dkim} {_dkim}} errors_to = "" fail_remote_domains: @@ -103,11 +115,15 @@ remote_smtp_dkim: command_timeout = 2s final_timeout = 2s +.ifdef _HAVE_DKIM +.ifdef SRV dkim_domain = test.ex dkim_selector = sel dkim_private_key = DIR/aux-fixed/dkim/dkim.private .ifndef HEADERS_MAXSIZE - dkim_sign_headers = OPT + dkim_sign_headers = LIST +.endif +.endif .endif # ----- Retry -----