Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/exim-config
authorMark Wooding <mdw@distorted.org.uk>
Sat, 20 Dec 2014 19:57:25 +0000 (19:57 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Sat, 20 Dec 2014 19:57:25 +0000 (19:57 +0000)
* 'master' of git.distorted.org.uk:~mdw/publish/public-git/exim-config:
  README: Add a bunch of technical documentation.

base.m4

diff --git a/base.m4 b/base.m4
index 579e835..807c57a 100644 (file)
--- a/base.m4
+++ b/base.m4
@@ -89,7 +89,7 @@ SECTION(global, bounce)m4_dnl
 delay_warning = 1h : 24h : 2d
 
 SECTION(global, tls)m4_dnl
-tls_certificate = CONF_sysconf_dir/server.cert
+tls_certificate = CONF_sysconf_dir/server.certlist
 tls_privatekey = CONF_sysconf_dir/server.key
 tls_advertise_hosts = ${if exists {CONF_sysconf_dir/server.key} {*}{}}
 tls_dhparam = CONF_ca_dir/dh-param-2048.pem
@@ -428,7 +428,7 @@ smtp_dhbits_2048:
 smtp_local:
        driver = smtp
        hosts_require_tls = *
-       tls_certificate = CONF_sysconf_dir/client.cert
+       tls_certificate = CONF_sysconf_dir/client.certlist
        tls_privatekey = CONF_sysconf_dir/client.key
        tls_verify_certificates = CONF_ca_dir/ca.cert
        tls_require_ciphers = CONF_good_ciphers