diff options
| author |   jsing <jsing@openbsd.org> | 2015-07-15 17:10:47 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2015-07-15 17:10:47 +0000 |
| commit | 6efdc207a8d77d2bf0ce81a0110dea8d3076ceb0 (patch) | |
| tree | 9e92f35bc0881dd082d0c6b4f8e1d07ca026e80a | |
| parent | Memory leak; Coverity CID 78836 (diff) | |
| download | wireguard-openbsd-6efdc207a8d77d2bf0ce81a0110dea8d3076ceb0.tar.xz wireguard-openbsd-6efdc207a8d77d2bf0ce81a0110dea8d3076ceb0.zip | |
Document default locations for TLS certificate and key.
ok reyk@
| -rw-r--r-- | usr.sbin/httpd/httpd.conf.5 | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/usr.sbin/httpd/httpd.conf.5 b/usr.sbin/httpd/httpd.conf.5 index db73b8f6720..b3eaad852a9 100644 --- a/usr.sbin/httpd/httpd.conf.5 +++ b/usr.sbin/httpd/httpd.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: httpd.conf.5,v 1.63 2015/06/23 17:29:19 jmc Exp $ +.\" $OpenBSD: httpd.conf.5,v 1.64 2015/07/15 17:10:47 jsing Exp $ .\" .\" Copyright (c) 2014, 2015 Reyk Floeter <reyk@openbsd.org> .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: June 23 2015 $ +.Dd $Mdocdate: July 15 2015 $ .Dt HTTPD.CONF 5 .Os .Sh NAME @@ -412,6 +412,8 @@ Specify the certificate to use for this server. The .Ar file should contain a PEM encoded certificate. +The default is +.Pa /etc/ssl/server.crt . .It Ic ciphers Ar string Specify the TLS cipher string. If not specified, the default value @@ -438,6 +440,8 @@ should contain a PEM encoded private key and reside outside of the .Xr chroot 2 root directory of .Nm httpd . +The default is +.Pa /etc/ssl/private/server.key . .It Ic protocols Ar string Specify the TLS protocols to enable for this server. If not specified, the value |