git://git.exim.org
/
users
/
jgh
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Testsuite: increase retry time (for really slow test host)
[users/jgh/exim.git]
/
test
/
confs
/
2111
diff --git
a/test/confs/2111
b/test/confs/2111
index 9abfc7a1afb233008a4e8bfe2d3bc1942ad43779..b54c9490d26e7d70df568bdd941c0a540f1601b9 100644
(file)
--- a/
test/confs/2111
+++ b/
test/confs/2111
@@
-2,13
+2,9
@@
SERVER =
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
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
# ----- Main settings -----
# ----- Main settings -----
@@
-27,6
+23,9
@@
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}
tls_verify_hosts = *
tls_verify_certificates = ${if eq {SERVER}{server}{DIR/aux-fixed/cert2}fail}
+.ifdef _OPT_OPENSSL_NO_TLSV1_3_X
+openssl_options = +no_tlsv1_3
+.endif
# ----- Routers -----
# ----- Routers -----
@@
-51,7
+50,7
@@
send_to_server:
port = PORT_D
tls_certificate = DIR/aux-fixed/cert2
tls_privatekey = DIR/aux-fixed/cert2
port = PORT_D
tls_certificate = DIR/aux-fixed/cert2
tls_privatekey = DIR/aux-fixed/cert2
- tls_require_ciphers = IDEA-CBC-MD5
\
- ${if eq{$host_address}{127.0.0.1}{:
DES-CBC3
-SHA:RSA_ARCFOUR_SHA}}
+ tls_require_ciphers = IDEA-CBC-MD5
:
\
+ ${if eq{$host_address}{127.0.0.1}{:
AES256
-SHA:RSA_ARCFOUR_SHA}}
# End
# End