From: Mark Wooding Date: Sat, 20 Dec 2014 19:57:25 +0000 (+0000) Subject: Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/exim-config X-Git-Url: https://git.distorted.org.uk/~mdw/exim-config/commitdiff_plain/223894bdc349f41858e81e4e819576fb3683e62b?hp=cf699684ac7a068d06bc5782eacea64dd45ac723 Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/exim-config * 'master' of git.distorted.org.uk:~mdw/publish/public-git/exim-config: README: Add a bunch of technical documentation. --- diff --git a/base.m4 b/base.m4 index 579e835..807c57a 100644 --- 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