From fb2bfdbd27f5c9a3b87072083a5e406543ff7722 Mon Sep 17 00:00:00 2001 From: reyk Date: Sun, 28 Dec 2014 13:53:23 +0000 Subject: [PATCH] Change the default example from "listen on egress" to "listen on *". Listening on the egress group only works if you have a default route; this confused some people. --- usr.sbin/httpd/httpd.conf.5 | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/usr.sbin/httpd/httpd.conf.5 b/usr.sbin/httpd/httpd.conf.5 index 94acbd641f7..222b3dc37cd 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.39 2014/12/18 10:18:25 reyk Exp $ +.\" $OpenBSD: httpd.conf.5,v 1.40 2014/12/28 13:53:23 reyk Exp $ .\" .\" Copyright (c) 2014 Reyk Floeter .\" @@ -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: December 18 2014 $ +.Dd $Mdocdate: December 28 2014 $ .Dt HTTPD.CONF 5 .Os .Sh NAME @@ -354,16 +354,13 @@ Include types definitions from an external file, for example .El .Sh EXAMPLES The following example will start one server that is pre-forked two -times and listening on the primary IP address of the network interface -that is a member of the -.Qq egress -group. +times and is listening on all local IP addresses. It additionally defines some media types overriding the defaults. .Bd -literal -offset indent prefork 2 server "default" { - listen on egress port 80 + listen on * port 80 } types { @@ -378,6 +375,16 @@ types { } .Ed .Pp +The server can also be configured to only listen on the primary IP +address of the network interface that is a member of the +.Qq egress +group. +.Bd -literal -offset indent +server "default" { + listen on egress port 80 +} +.Ed +.Pp Multiple servers can be configured to support hosting of different domains. If the same address is repeated multiple times in the .Ic listen on -- 2.20.1