summaryrefslogtreecommitdiffstats
path: root/usr.sbin/httpd
diff options
context:
space:
mode:
authorjmc <jmc@openbsd.org>2019-03-12 21:38:56 +0000
committerjmc <jmc@openbsd.org>2019-03-12 21:38:56 +0000
commita75fa34b6fc6c4db1eadd6453c705ad7b09d5450 (patch)
tree57460ae040f5bde858a4c3488e7f472aa29ff2de /usr.sbin/httpd
parentDECRC and DECSC apparently need to preserve origin mode as well, based (diff)
downloadwireguard-openbsd-a75fa34b6fc6c4db1eadd6453c705ad7b09d5450.tar.xz
wireguard-openbsd-a75fa34b6fc6c4db1eadd6453c705ad7b09d5450.zip
reference the /etc/examples files for httpd and acme-client. started from a thread
by alfred morgan, who wanted a tls example in the man page. florian noted that they exist already in /etc/examples; ok florian
Diffstat (limited to 'usr.sbin/httpd')
-rw-r--r--usr.sbin/httpd/httpd.conf.513
1 files changed, 11 insertions, 2 deletions
diff --git a/usr.sbin/httpd/httpd.conf.5 b/usr.sbin/httpd/httpd.conf.5
index 608701e59c4..457847cd0a2 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.103 2019/02/19 11:37:26 pirofti Exp $
+.\" $OpenBSD: httpd.conf.5,v 1.104 2019/03/12 21:38:56 jmc 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: February 19 2019 $
+.Dd $Mdocdate: March 12 2019 $
.Dt HTTPD.CONF 5
.Os
.Sh NAME
@@ -674,6 +674,15 @@ Include types definitions from an external file, for example
.Pa /usr/share/misc/mime.types .
.El
.Sh EXAMPLES
+Example configuration files for
+.Nm
+and
+.Xr acme-client 1
+are provided in
+.Pa /etc/examples/httpd.conf
+and
+.Pa /etc/examples/acme-client.conf .
+.Pp
The following example will start one server that is pre-forked two
times and is listening on all local IP addresses.
It additionally defines some media types overriding the defaults.