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
FreeBSD: TLS: preload configuration items
[users/heiko/exim.git]
/
test
/
confs
/
2126
diff --git
a/test/confs/2126
b/test/confs/2126
index 182895a19883ef0d29ceea16942797523b102f6e..d98681be2dcdb749ebc5e5c6e75b5ed31afabf01 100644
(file)
--- a/
test/confs/2126
+++ b/
test/confs/2126
@@
-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 -----
@@
-18,8
+13,6
@@
log_selector = +tls_peerdn
tls_advertise_hosts = HOSTIPV4
tls_certificate = DIR/aux-fixed/cert1
tls_advertise_hosts = HOSTIPV4
tls_certificate = DIR/aux-fixed/cert1
-tls_privatekey = DIR/aux-fixed/cert1
-
# ----- ACLs -----
# ----- ACLs -----
@@
-56,8
+49,10
@@
t1:
driver = smtp
hosts = 127.0.0.1 : HOSTIPV4
port = PORT_D
driver = smtp
hosts = 127.0.0.1 : HOSTIPV4
port = PORT_D
+ hosts_try_fastopen = :
allow_localhost
allow_localhost
- tls_try_verify_hosts = :
+ tls_verify_certificates = DIR/aux-fixed/cert1
+ tls_verify_cert_hostnames = :
t2:
driver = appendfile
t2:
driver = appendfile