From 70a70462e56ed8ffa89f8bd1f7997bc034e84d73 Mon Sep 17 00:00:00 2001 From: Aaron Jones Date: Thu, 5 May 2016 04:15:46 +0000 Subject: [PATCH] [Documentation] Reflect that ssl_private_key is now optional [ci skip] --- doc/ircd.conf.example | 8 ++++---- doc/reference.conf | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/ircd.conf.example b/doc/ircd.conf.example index 1e11bd6f..d0821b22 100644 --- a/doc/ircd.conf.example +++ b/doc/ircd.conf.example @@ -61,12 +61,12 @@ serverinfo { /* for IPv6 */ #vhost6 = "2001:db8:2::6"; - /* ssl_private_key: our ssl private key */ - ssl_private_key = "etc/ssl.key"; - - /* ssl_cert: certificate for our ssl server */ + /* ssl_cert: certificate (and optionally key) for our ssl server */ ssl_cert = "etc/ssl.pem"; + /* ssl_private_key: our ssl private key (if not contained in ssl_cert file) */ + #ssl_private_key = "etc/ssl.key"; + /* ssl_dh_params: DH parameters, generate with openssl dhparam -out dh.pem 2048 * In general, the DH parameters size should be the same as your key's size. * However it has been reported that some clients have broken TLS implementations which may diff --git a/doc/reference.conf b/doc/reference.conf index d0b17bb0..b8e99f83 100644 --- a/doc/reference.conf +++ b/doc/reference.conf @@ -148,12 +148,12 @@ serverinfo { */ #vhost6 = "2001:db7:2::6"; - /* ssl_private_key: our ssl private key */ - ssl_private_key = "etc/ssl.key"; - - /* ssl_cert: certificate for our ssl server */ + /* ssl_cert: certificate (and optionally key) for our ssl server */ ssl_cert = "etc/ssl.pem"; + /* ssl_private_key: our ssl private key (if not contained in ssl_cert file) */ + #ssl_private_key = "etc/ssl.key"; + /* ssl_dh_params: DH parameters, generate with openssl dhparam -out dh.pem 1024 */ ssl_dh_params = "etc/dh.pem";