git://git.exim.org
/
users
/
heiko
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Docs: add info on router variable evaluation order
[users/heiko/exim.git]
/
test
/
confs
/
2138
diff --git
a/test/confs/2138
b/test/confs/2138
index 7fec82541853f7a4f27d0422ce8f639603360a59..c255373b5c0a984bfdcb9623bd80ba4d8b12af9e 100644
(file)
--- a/
test/confs/2138
+++ b/
test/confs/2138
@@
-19,11
+19,7
@@
remote_max_parallel = 1
smtp_accept_max_nonmail = 0
tls_advertise_hosts = *
smtp_accept_max_nonmail = 0
tls_advertise_hosts = *
-
-# Set certificate only if server
-
-tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
-tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
+tls_certificate = DIR/aux-fixed/cert1
# ----- Routers -----
# ----- Routers -----
@@
-50,16
+46,18
@@
begin transports
local_delivery:
driver = appendfile
local_delivery:
driver = appendfile
- file = DIR/test-mail/$
local_part
+ file = DIR/test-mail/$
{bless:$local_part}
headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
user = CALLER
send_to_server:
headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
user = CALLER
send_to_server:
- driver = smtp
+ driver =
smtp
allow_localhost
allow_localhost
- hosts_noproxy_tls = :
- port = PORT_D
- tls_try_verify_hosts = :
- max_rcpt = 1
+ port = PORT_D
+ hosts_try_fastopen = :
+ hosts_noproxy_tls = :
+ tls_verify_certificates = DIR/aux-fixed/cert1
+ tls_verify_cert_hostnames = :
+ max_rcpt = 1
# End
# End