From 1dda4df9f8a4a6ff0d36ea1a7ee4648cb212e057 Mon Sep 17 00:00:00 2001
Message-Id: <1dda4df9f8a4a6ff0d36ea1a7ee4648cb212e057.1715289515.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Tue, 26 Jun 2018 16:26:45 +0100
Subject: [PATCH] base.m4, config.m4: Make the certificate list tweakable in
 config.
Organization: Straylight/Edgeware

From: Mark Wooding <mdw@distorted.org.uk>

---
 base.m4   | 2 +-
 config.m4 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/base.m4 b/base.m4
index 4961012..c0dd892 100644
--- a/base.m4
+++ b/base.m4
@@ -105,7 +105,7 @@ SECTION(global, bounce)m4_dnl
 delay_warning = 1h : 24h : 2d
 
 SECTION(global, tls)m4_dnl
-tls_certificate = CONF_sysconf_dir/server.certlist
+tls_certificate = CONF_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
diff --git a/config.m4 b/config.m4
index 5cabfeb..db6b966 100644
--- a/config.m4
+++ b/config.m4
@@ -79,6 +79,9 @@ DEFCONF(relay_clients, <m4_dnl
 ; 172.29.198.161 ; 2001:ba8:1d9:a000::1:1 m4_dnl national
 )
 
+## TLS certificate list.
+DEFCONF(certlist, CONF_sysconf_dir/server.certlist)
+
 ## TLS-related settings.  We're assuming GNUTLS here, rather than OpenSSL.
 ## For local connections we are very strict.  For random clients, we try
 ## fairly hard to encourage any kind of crypto on the grounds that probably
-- 
[mdw]