git://git.exim.org
/
users
/
jgh
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
transmit with DKIM
[users/jgh/exim.git]
/
test
/
confs
/
0900
diff --git
a/test/confs/0900
b/test/confs/0900
index 4a014cee1139092464bd4ac765dd0aea4afbacf8..3235f1ee7f51137f9a3ac30e4b86cd2dd75af49f 100644
(file)
--- a/
test/confs/0900
+++ b/
test/confs/0900
@@
-1,4
+1,7
@@
# Exim test configuration 0900
# Exim test configuration 0900
+SERVER=
+X=
+OPT=
exim_path = EXIM_PATH
keep_environment =
exim_path = EXIM_PATH
keep_environment =
@@
-13,15
+16,14
@@
tls_advertise_hosts =
# ----- Main settings -----
# ----- Main settings -----
-domainlist local_domains = @
+domainlist local_domains = @
: test.ex
acl_smtp_rcpt = check_recipient
acl_smtp_data = check_data
acl_smtp_rcpt = check_recipient
acl_smtp_data = check_data
-message_id_header_domain = ${if eq{0}{0}{some.domain}}
-message_id_header_text = ${if eq{0}{0}{a@b[c]}}
trusted_users = CALLER
queue_only
smtp_receive_timeout = 2s
trusted_users = CALLER
queue_only
smtp_receive_timeout = 2s
+log_selector = +received_recipients
# ----- ACL -----
# ----- ACL -----
@@
-42,6
+44,12
@@
check_data:
begin routers
begin routers
+to_server:
+ driver = accept
+ condition = ${if !eq {SERVER}{server}}
+ transport = remote_smtp${if eq {X}{dkim} {_dkim}}
+ errors_to = ""
+
fail_remote_domains:
driver = redirect
domains = ! +local_domains
fail_remote_domains:
driver = redirect
domains = ! +local_domains
@@
-68,4
+76,31
@@
local_delivery:
X-received-count: $received_count"
return_path_add
X-received-count: $received_count"
return_path_add
+remote_smtp:
+ driver = smtp
+ hosts = 127.0.0.1
+ port = PORT_S
+ allow_localhost
+ command_timeout = 2s
+ final_timeout = 2s
+
+remote_smtp_dkim:
+ driver = smtp
+ hosts = 127.0.0.1
+ port = PORT_S
+ allow_localhost
+ command_timeout = 2s
+ final_timeout = 2s
+
+ dkim_domain = test.ex
+ dkim_selector = sel
+ dkim_private_key = DIR/aux-fixed/dkim/dkim.private
+.ifndef HEADERS_MAXSIZE
+ dkim_sign_headers = OPT
+.endif
+
+# ----- Retry -----
+
+begin retry
+* * F,30m,5m;
# End
# End