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
DKIM: ensure that dkim_domain elements are lowercased before use. Bug 2371
[exim.git]
/
test
/
confs
/
5840
diff --git
a/test/confs/5840
b/test/confs/5840
index 0447ce36dae3989601bb8ca203edc59571e72b66..407846a8a9bd723afeacea39657c31fcf902120d 100644
(file)
--- a/
test/confs/5840
+++ b/
test/confs/5840
@@
-1,20
+1,16
@@
# Exim test configuration 5840
# Exim test configuration 5840
-# DANE
+# DANE
/OpenSSL
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 -----
.ifndef OPT
# ----- Main settings -----
.ifndef OPT
-acl_smtp_rcpt = accept
+acl_smtp_rcpt = accept
logwrite = "rcpt ACL"
.else
acl_smtp_rcpt = accept verify = recipient/callout
.endif
.else
acl_smtp_rcpt = accept verify = recipient/callout
.endif
@@
-26,20
+22,28
@@
queue_run_in_order
tls_advertise_hosts = *
# Set certificate only if server
tls_advertise_hosts = *
# Set certificate only if server
-CDIR1 = DIR/aux-fixed
+CDIR1 = DIR/aux-fixed
/exim-ca/example.net/server1.example.net
CDIR2 = DIR/aux-fixed/exim-ca/example.com/server1.example.com
CDIR2 = DIR/aux-fixed/exim-ca/example.com/server1.example.com
+.ifdef CERT
+tls_certificate = CERT
+.else
tls_certificate = ${if eq {SERVER}{server} \
tls_certificate = ${if eq {SERVER}{server} \
- {${if or {{eq {DETAILS}{ta}} {eq {DETAILS}{ca}}} \
+ {${if or {{eq {DETAILS}{ta}} {eq {DETAILS}{ca}}
{eq {DETAILS}{ee}}
} \
{CDIR2/fullchain.pem}\
{CDIR2/fullchain.pem}\
- {CDIR1/
cert1
}}}\
+ {CDIR1/
fullchain.pem
}}}\
fail}
fail}
+.endif
+.ifdef ALLOW
+tls_privatekey = ALLOW
+.else
tls_privatekey = ${if eq {SERVER}{server} \
tls_privatekey = ${if eq {SERVER}{server} \
- {${if or {{eq {DETAILS}{ta}} {eq {DETAILS}{ca}}} \
+ {${if or {{eq {DETAILS}{ta}} {eq {DETAILS}{ca}}
{eq {DETAILS}{ee}}
} \
{CDIR2/server1.example.com.unlocked.key}\
{CDIR2/server1.example.com.unlocked.key}\
- {CDIR1/
cert1
}}}\
+ {CDIR1/
server1.example.net.unlocked.key
}}}\
fail}
fail}
+.endif
# ----- Routers -----
# ----- Routers -----
@@
-51,6
+55,7
@@
client:
dnssec_request_domains = *
self = send
transport = send_to_server
dnssec_request_domains = *
self = send
transport = send_to_server
+ errors_to = ""
server:
driver = redirect
server:
driver = redirect
@@
-66,15
+71,11
@@
send_to_server:
allow_localhost
port = PORT_D
allow_localhost
port = PORT_D
- hosts_verify_avoid_tls = :
hosts_try_dane = *
hosts_try_dane = *
- hosts_require_dane = !thishost.test.ex
- hosts_request_ocsp = ${if or { {= {4}{$tls_out_tlsa_usage}} \
- {= {0}{$tls_out_tlsa_usage}} } \
- {*}{}}
+ hosts_require_dane = HOSTIPV4
tls_verify_cert_hostnames = ${if eq {OPT}{no_certname} {}{*}}
tls_try_verify_hosts = thishost.test.ex
tls_verify_cert_hostnames = ${if eq {OPT}{no_certname} {}{*}}
tls_try_verify_hosts = thishost.test.ex
- tls_verify_certificates =
CDIR2/ca_chain.pem
+ tls_verify_certificates =
${if eq {DETAILS}{ca} {CDIR2/ca_chain.pem} {}}