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
typoes
[users/heiko/exim.git]
/
test
/
confs
/
2117
diff --git
a/test/confs/2117
b/test/confs/2117
index 8a56c713d139a9429f108da1c25848663eb96295..f05eedb0a918a8fcdb71a8d9b94ffd3123263eaf 100644
(file)
--- a/
test/confs/2117
+++ b/
test/confs/2117
@@
-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 -----
@@
-50,7
+45,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
@@
-58,9
+53,10
@@
send_to_server:
driver = smtp
allow_localhost
hosts = 127.0.0.1
driver = smtp
allow_localhost
hosts = 127.0.0.1
- hosts_nopass_tls = *
port = PORT_D
port = PORT_D
+ hosts_try_fastopen = :
tls_try_verify_hosts = :
tls_try_verify_hosts = :
+ hosts_nopass_tls = *
# ----- Retry -----
# ----- Retry -----