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
Utilities: harden exim_tidydb against corrupt wait-records. Bug 2343
[users/heiko/exim.git]
/
test
/
confs
/
2149
diff --git
a/test/confs/2149
b/test/confs/2149
index 810ab712a3e802a0f5eea1e41d8eb638cbe2d7ca..9fa4fbf5a3e1c03f03b0a68d8fa100f8afa3abc9 100644
(file)
--- a/
test/confs/2149
+++ b/
test/confs/2149
@@
-2,14
+2,9
@@
SERVER =
SERVER =
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
primary_hostname = myhost.test.ex
primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
# ----- Main settings -----
# ----- Main settings -----
@@
-19,8
+14,7
@@
queue_only
queue_run_in_order
tls_advertise_hosts = *
queue_run_in_order
tls_advertise_hosts = *
-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
tls_dhparam = ${if eq {SERVER}{server}{DIR/aux-fixed/dh1}fail}
tls_dhparam = ${if eq {SERVER}{server}{DIR/aux-fixed/dh1}fail}
@@
-46,7
+40,7
@@
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
headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
user = CALLER
@@
-55,6
+49,8
@@
send_to_server:
allow_localhost
hosts = 127.0.0.1
port = PORT_D
allow_localhost
hosts = 127.0.0.1
port = PORT_D
- tls_try_verify_hosts = :
+ hosts_try_fastopen = :
+ tls_verify_certificates = DIR/aux-fixed/cert1
+ tls_verify_cert_hostnames = :
# End
# End