X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/44bc8f0c2f3576b46bd6df1b818cb29eaf84df5b..6acd9fcf8454b0a18065bcd6ee865c5ddc82e44d:/test/confs/0900 diff --git a/test/confs/0900 b/test/confs/0900 index 427669c4b..2eaf01ee3 100644 --- a/test/confs/0900 +++ b/test/confs/0900 @@ -1,8 +1,7 @@ # Exim test configuration 0900 SERVER= -X= Y= -OPT= +LIST= ALLOW= exim_path = EXIM_PATH @@ -18,6 +17,7 @@ tls_advertise_hosts = ${if eq {Y}{tls} {*}} # ----- Main settings ----- +primary_hostname = testhost.test.ex domainlist local_domains = @ : test.ex acl_smtp_rcpt = check_recipient @@ -58,7 +58,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 {OPT}{dkim} {_dkim}} errors_to = "" fail_remote_domains: @@ -103,11 +103,13 @@ remote_smtp_dkim: command_timeout = 2s final_timeout = 2s +.ifdef OPT 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 # ----- Retry -----