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: fix description of hosts_try_dane. Bug 2704
[users/heiko/exim.git]
/
test
/
confs
/
4221
diff --git
a/test/confs/4221
b/test/confs/4221
index 085fecc72cc043a2ddd1ec7e70d8df0baaeb4a31..07feb488b604a152fd294ace0763bdd54529ba1f 100644
(file)
--- a/
test/confs/4221
+++ b/
test/confs/4221
@@
-4,12
+4,7
@@
OPTION = *
CONTROL =
OPTION = *
CONTROL =
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/tls_conf_prefix
# ----- Main settings -----
# ----- Main settings -----
@@
-26,9
+21,8
@@
queue_only
queue_run_in_order
.endif
queue_run_in_order
.endif
-tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
-tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
tls_advertise_hosts = *
tls_advertise_hosts = *
+tls_certificate = DIR/aux-fixed/cert1
smtputf8_advertise_hosts = OPTION
smtputf8_advertise_hosts = OPTION
@@
-112,15
+106,18
@@
local_delivery:
user = CALLER
delivery_date_add
envelope_to_add
user = CALLER
delivery_date_add
envelope_to_add
- file = DIR/test-mail/$
local_part
+ file = DIR/test-mail/$
{bless:$local_part}
headers_add = "X-body-linecount: $body_linecount\n\
X-message-linecount: $message_linecount\n\
X-received-count: $received_count"
return_path_add
rmt_smtp:
headers_add = "X-body-linecount: $body_linecount\n\
X-message-linecount: $message_linecount\n\
X-received-count: $received_count"
return_path_add
rmt_smtp:
- driver = smtp
- hosts_require_tls = *
- tls_try_verify_hosts = :
+ driver = smtp
+ hosts_try_fastopen = :
+ hosts_require_tls = *
+ tls_verify_certificates = DIR/aux-fixed/cert1
+ tls_verify_cert_hostnames = :
+ utf8_downconvert = 0
# End
# End