diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2017-12-19 22:14:18 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2017-12-19 22:14:18 +0000 |
| commit | d4fd1b83a197d73cbac114fe53f3448d8b5c7cc2 (patch) | |
| tree | 595ac359ff45f8e9f8b29f6432cb088a17cf7a88 /test/confs/5840 | |
| parent | 3721c5545411010ffbea82fc58b883664d07e865 (diff) | |
| parent | b4ad78623875988d016ff816dc6c9c382be897f9 (diff) | |
Merge branch '4.next'
Diffstat (limited to 'test/confs/5840')
| -rw-r--r-- | test/confs/5840 | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/test/confs/5840 b/test/confs/5840 index 01c114252..10ca2111b 100644 --- a/test/confs/5840 +++ b/test/confs/5840 @@ -1,5 +1,5 @@ # Exim test configuration 5840 -# DANE +# DANE/OpenSSL SERVER= @@ -10,7 +10,7 @@ primary_hostname = myhost.test.ex # ----- Main settings ----- .ifndef OPT -acl_smtp_rcpt = accept +acl_smtp_rcpt = accept logwrite = "rcpt ACL" .else acl_smtp_rcpt = accept verify = recipient/callout .endif @@ -22,20 +22,28 @@ queue_run_in_order 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 +.ifdef CERT +tls_certificate = CERT +.else 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}\ - {CDIR1/cert1}}}\ + {CDIR1/fullchain.pem}}}\ fail} +.endif +.ifdef ALLOW +tls_privatekey = ALLOW +.else 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}\ - {CDIR1/cert1}}}\ + {CDIR1/server1.example.net.unlocked.key}}}\ fail} +.endif # ----- Routers ----- |