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 the PIPE_CONNECT feature control in the template Makefile, the
[users/heiko/exim.git]
/
test
/
confs
/
2130
diff --git
a/test/confs/2130
b/test/confs/2130
index 4143fc8caaae6008440dc59588d452de56c4d805..0559bba538d9d3e9db3615267e22395611494b0a 100644
(file)
--- a/
test/confs/2130
+++ b/
test/confs/2130
@@
-3,15
+3,9
@@
SERVER =
SERVER =
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-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
+.include DIR/aux-var/tls_conf_prefix
+primary_hostname = myhost.test.ex
# ----- Main settings -----
# ----- Main settings -----
@@
-22,10
+16,7
@@
log_selector = +tls_peerdn +tls_sni
remote_max_parallel = 1
tls_advertise_hosts = *
remote_max_parallel = 1
tls_advertise_hosts = *
-
-# Set certificate only if server
-
-tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
+tls_certificate = DIR/aux-fixed/cert1
# ------ ACL ------
# ------ ACL ------
@@
-59,13
+50,19
@@
send_to_server1:
allow_localhost
hosts = HOSTIPV4
port = PORT_D
allow_localhost
hosts = HOSTIPV4
port = PORT_D
+ hosts_try_fastopen = :
tls_sni = fred
tls_sni = fred
+ tls_verify_certificates = DIR/aux-fixed/cert1
+ tls_verify_cert_hostnames = :
send_to_server2:
driver = smtp
allow_localhost
hosts = HOSTIPV4
port = PORT_D
send_to_server2:
driver = smtp
allow_localhost
hosts = HOSTIPV4
port = PORT_D
+ hosts_try_fastopen = :
+ tls_verify_certificates = DIR/aux-fixed/cert1
+ tls_verify_cert_hostnames = :
# ----- Retry -----
# ----- Retry -----