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
Fix list-expansion for various domainlists, having included sublist elements. Bug...
[users/heiko/exim.git]
/
test
/
confs
/
2111
diff --git
a/test/confs/2111
b/test/confs/2111
index d69f2a612558848bf1a2119fe62dba09ce4f2b11..42458efba103f684f59ccf3739eec22c6745fed9 100644
(file)
--- a/
test/confs/2111
+++ b/
test/confs/2111
@@
-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 -----
@@
-28,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 -----
@@
-48,11
+46,12
@@
send_to_server:
driver = smtp
allow_localhost
hosts = HOSTIPV4 : 127.0.0.1
driver = smtp
allow_localhost
hosts = HOSTIPV4 : 127.0.0.1
- hosts_require_tls = HOSTIPV4
port = PORT_D
port = PORT_D
+ hosts_try_fastopen = :
+ hosts_require_tls = HOSTIPV4
tls_certificate = DIR/aux-fixed/cert2
tls_privatekey = DIR/aux-fixed/cert2
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