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
Docs: add note on DKIM verify disable
[exim.git]
/
test
/
confs
/
0900
diff --git
a/test/confs/0900
b/test/confs/0900
index e02380f73694e637ca9116012bc5589742c3a6f5..80c0211a936743bd1e85005703aa6a5f8c07b365 100644
(file)
--- a/
test/confs/0900
+++ b/
test/confs/0900
@@
-6,14
+6,25
@@
ALLOW=
exim_path = EXIM_PATH
keep_environment =
exim_path = EXIM_PATH
keep_environment =
+add_environment = SSLKEYLOGFILE=DIR/spool/sslkeys
host_lookup_order = bydns
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
gecos_name = CALLER_NAME
chunking_advertise_hosts = *
host_lookup_order = bydns
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
gecos_name = CALLER_NAME
chunking_advertise_hosts = *
+.ifdef _HAVE_TLS
tls_advertise_hosts = ${if eq {SRV}{tls} {*}}
tls_advertise_hosts = ${if eq {SRV}{tls} {*}}
-
+.endif
+.ifdef _HAVE_PIPE_CONNECT
+pipelining_connect_advertise_hosts = :
+.endif
+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
+.ifdef _OPT_MAIN_LIMITS_ADVERTISE_HOSTS
+limits_advertise_hosts = !*
+.endif
# ----- Main settings -----
# ----- Main settings -----
@@
-21,16
+32,22
@@
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
+.ifdef _HAVE_PRDR
acl_smtp_data_prdr = check_prdr
acl_smtp_data_prdr = check_prdr
+.endif
acl_smtp_data = check_data
trusted_users = CALLER
queue_only
smtp_receive_timeout = 2s
acl_smtp_data = check_data
trusted_users = CALLER
queue_only
smtp_receive_timeout = 2s
-log_selector = +received_recipients
-.ifdef _OPT_MAIN_TLS_CERTIFICATE
-tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
-tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
+.ifdef _HAVE_DKIM
+log_selector = +received_recipients +connection_id +millisec +dkim_verbose
+.else
+log_selector = +received_recipients +connection_id +millisec
+.endif
+
+.ifdef _HAVE_TLS
+tls_certificate = DIR/aux-fixed/cert1
.endif
ALLOW
.endif
ALLOW
@@
-40,6
+57,10
@@
ALLOW
begin acl
check_recipient:
begin acl
check_recipient:
+.ifdef RETRY2
+ drop condition = ${if eq {SERVER}{server}}
+ message = 550 we really do not like you
+.endif
accept hosts = :
accept domains = +local_domains
deny message = relay not permitted
accept hosts = :
accept domains = +local_domains
deny message = relay not permitted
@@
-59,7
+80,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 {
OPT
}{dkim} {_dkim}}
+ transport = remote_smtp${if eq {
SRV
}{dkim} {_dkim}}
errors_to = ""
fail_remote_domains:
errors_to = ""
fail_remote_domains:
@@
-83,6
+104,7
@@
local_delivery:
delivery_date_add
envelope_to_add
file = DIR/test-mail/$local_part
delivery_date_add
envelope_to_add
file = DIR/test-mail/$local_part
+ create_file = DIR/test-mail
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"
@@
-90,8
+112,17
@@
local_delivery:
remote_smtp:
driver = smtp
remote_smtp:
driver = smtp
+.ifdef RETRY2
+ hosts = 127.0.0.1 : HOSTIPV4
+.else
hosts = 127.0.0.1
hosts = 127.0.0.1
+.endif
port = PORT_S
port = PORT_S
+ hosts_try_fastopen = :
+.ifdef _HAVE_TLS
+ tls_verify_certificates = DIR/aux-fixed/cert1
+ tls_verify_cert_hostnames =
+.endif
allow_localhost
command_timeout = 2s
final_timeout = 2s
allow_localhost
command_timeout = 2s
final_timeout = 2s
@@
-100,11
+131,17
@@
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 = :
+.ifdef _HAVE_TLS
+ tls_verify_certificates = DIR/aux-fixed/cert1
+ tls_verify_cert_hostnames =
+.endif
allow_localhost
command_timeout = 2s
final_timeout = 2s
allow_localhost
command_timeout = 2s
final_timeout = 2s
-.ifdef OPT
+.ifdef _HAVE_DKIM
+.ifdef SRV
dkim_domain = test.ex
dkim_selector = sel
dkim_private_key = DIR/aux-fixed/dkim/dkim.private
dkim_domain = test.ex
dkim_selector = sel
dkim_private_key = DIR/aux-fixed/dkim/dkim.private
@@
-112,6
+149,7
@@
remote_smtp_dkim:
dkim_sign_headers = LIST
.endif
.endif
dkim_sign_headers = LIST
.endif
.endif
+.endif
# ----- Retry -----
# ----- Retry -----