git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ibase lookup: further compile fixes
[exim.git]
/
test
/
confs
/
2001
diff --git
a/test/confs/2001
b/test/confs/2001
index 741796b678cd6c3ac3e1987d8270447737607178..f8358cbd4b64912466dec2062b0010b1ed937ad6 100644
(file)
--- a/
test/confs/2001
+++ b/
test/confs/2001
@@
-3,14
+3,9
@@
OPTION=
SERVER=
OPTION=
SERVER=
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
primary_hostname = myhost.test.ex
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
# ----- Main settings -----
# ----- Main settings -----
@@
-28,9
+23,9
@@
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 = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
-tls_verify_hosts = *
-tls_verify_certificates = ${if eq {SERVER}{server}{DIR/aux-fixed/cert2}fail}
+# so we can decode in wireshark
+tls_require_ciphers = NORMAL:-KX-ALL:+RSA
# ----- Routers -----
# ----- Routers -----
@@
-51,11
+46,11
@@
send_to_server:
driver = smtp
allow_localhost
hosts = 127.0.0.1
driver = smtp
allow_localhost
hosts = 127.0.0.1
+ hosts_try_fastopen = :
OPTION
port = PORT_D
OPTION
port = PORT_D
- tls_certificate = DIR/aux-fixed/cert2
- tls_privatekey = DIR/aux-fixed/cert2
tls_verify_certificates = DIR/aux-fixed/cert2
tls_verify_certificates = DIR/aux-fixed/cert2
+ tls_try_verify_hosts =
# ----- Retry -----
# ----- Retry -----