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
Docs: fix description of hosts_try_dane. Bug 2704
[users/heiko/exim.git]
/
test
/
confs
/
0900
diff --git
a/test/confs/0900
b/test/confs/0900
index 427669c4bf1e29a61cb9c9a2c0c37659e5b8faaa..ffce9e8863b3f25517d60c1e687cc2c238661538 100644
(file)
--- a/
test/confs/0900
+++ b/
test/confs/0900
@@
-1,8
+1,7
@@
# Exim test configuration 0900
SERVER=
# Exim test configuration 0900
SERVER=
-X=
-Y=
-OPT=
+SRV=
+LIST=
ALLOW=
exim_path = EXIM_PATH
ALLOW=
exim_path = EXIM_PATH
@@
-13,11
+12,21
@@
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
gecos_name = CALLER_NAME
chunking_advertise_hosts = *
gecos_pattern = ""
gecos_name = CALLER_NAME
chunking_advertise_hosts = *
-tls_advertise_hosts = ${if eq {Y}{tls} {*}}
+tls_advertise_hosts = ${if eq {SRV}{tls} {*}}
+.ifdef _HAVE_REQTLS
+tls_advertise_requiretls = :
+.endif
+.ifdef _HAVE_PIPE_CONNECT
+pipelining_connect_advertise_hosts = :
+.endif
+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
# ----- Main settings -----
# ----- Main settings -----
+primary_hostname = testhost.test.ex
domainlist local_domains = @ : test.ex
acl_smtp_rcpt = check_recipient
domainlist local_domains = @ : test.ex
acl_smtp_rcpt = check_recipient
@@
-26,10
+35,16
@@
acl_smtp_data = check_data
trusted_users = CALLER
queue_only
smtp_receive_timeout = 2s
trusted_users = CALLER
queue_only
smtp_receive_timeout = 2s
+
+.ifdef _HAVE_DKIM
+log_selector = +received_recipients +dkim_verbose
+.else
log_selector = +received_recipients
log_selector = +received_recipients
+.endif
-tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
-tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
+.ifdef _OPT_MAIN_TLS_CERTIFICATE
+tls_certificate = DIR/aux-fixed/cert1
+.endif
ALLOW
ALLOW
@@
-50,7
+65,6
@@
check_data:
warn message = X-acl-message-linecount: $message_linecount
accept
warn message = X-acl-message-linecount: $message_linecount
accept
-
# ----- Routers -----
begin routers
# ----- Routers -----
begin routers
@@
-58,7
+72,7
@@
begin routers
to_server:
driver = accept
condition = ${if !eq {SERVER}{server}}
to_server:
driver = accept
condition = ${if !eq {SERVER}{server}}
- transport = remote_smtp${if eq {
X
}{dkim} {_dkim}}
+ transport = remote_smtp${if eq {
SRV
}{dkim} {_dkim}}
errors_to = ""
fail_remote_domains:
errors_to = ""
fail_remote_domains:
@@
-81,7
+95,7
@@
local_delivery:
driver = appendfile
delivery_date_add
envelope_to_add
driver = appendfile
delivery_date_add
envelope_to_add
- file = DIR/test-mail/$
local_part
+ file = DIR/test-mail/$
{bless:$local_part}
headers_add = "X-body-linecount: $body_linecount\n\
X-message-linecount: $message_linecount\n\
X-received-count: $received_count"
headers_add = "X-body-linecount: $body_linecount\n\
X-message-linecount: $message_linecount\n\
X-received-count: $received_count"
@@
-91,6
+105,9
@@
remote_smtp:
driver = smtp
hosts = 127.0.0.1
port = PORT_S
driver = smtp
hosts = 127.0.0.1
port = PORT_S
+ hosts_try_fastopen = :
+ tls_verify_certificates = DIR/aux-fixed/cert1
+ tls_verify_cert_hostnames =
allow_localhost
command_timeout = 2s
final_timeout = 2s
allow_localhost
command_timeout = 2s
final_timeout = 2s
@@
-99,15
+116,22
@@
remote_smtp_dkim:
driver = smtp
hosts = 127.0.0.1
port = PORT_S
driver = smtp
hosts = 127.0.0.1
port = PORT_S
+ hosts_try_fastopen = :
+ tls_verify_certificates = DIR/aux-fixed/cert1
+ tls_verify_cert_hostnames =
allow_localhost
command_timeout = 2s
final_timeout = 2s
allow_localhost
command_timeout = 2s
final_timeout = 2s
+.ifdef _HAVE_DKIM
+.ifdef SRV
dkim_domain = test.ex
dkim_selector = sel
dkim_private_key = DIR/aux-fixed/dkim/dkim.private
.ifndef HEADERS_MAXSIZE
dkim_domain = test.ex
dkim_selector = sel
dkim_private_key = DIR/aux-fixed/dkim/dkim.private
.ifndef HEADERS_MAXSIZE
- dkim_sign_headers = OPT
+ dkim_sign_headers = LIST
+.endif
+.endif
.endif
# ----- Retry -----
.endif
# ----- Retry -----