aboutsummaryrefslogtreecommitdiff
path: root/httpd.8
diff options
context:
space:
mode:
Diffstat (limited to 'httpd.8')
-rw-r--r--httpd.862
1 files changed, 55 insertions, 7 deletions
diff --git a/httpd.8 b/httpd.8
index a62378d..ab301e1 100644
--- a/httpd.8
+++ b/httpd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: httpd.8,v 1.39 2014/07/22 19:03:21 jmc Exp $
+.\" $OpenBSD: httpd.8,v 1.48 2014/08/09 08:49:48 jmc Exp $
.\"
.\" Copyright (c) 2014 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: July 22 2014 $
+.Dd $Mdocdate: August 9 2014 $
.Dt HTTPD 8
.Os
.Sh NAME
@@ -26,20 +26,71 @@
.Op Fl D Ar macro Ns = Ns Ar value
.Op Fl f Ar file
.Sh DESCRIPTION
+The
+.Nm
+daemon is an HTTP server with FastCGI and SSL support.
+.Pp
+The FastCGI implementation has optional socket support.
.Nm
-is a simple HTTP server that serves static files.
+can log to
+.Xr syslog 3
+or per-server files with several standard formats.
+.Pp
+.Nm
+rereads its configuration file when it receives
+.Dv SIGHUP
+and reopens log files when it receives
+.Dv SIGUSR1 .
+.Pp
+The options are as follows:
+.Bl -tag -width Dssmacro=value
+.It Fl D Ar macro Ns = Ns Ar value
+Set a
+.Ar macro
+to a
+.Ar value .
+Macros can be referenced in the configuration files.
+.It Fl d
+Debug mode.
+Create one server and don't detach or become a daemon.
+This allows for easy monitoring of
+.Nm .
+.It Fl f Ar file
+Specifies the configuration file.
+The default is
+.Pa /etc/httpd.conf .
+.It Fl n
+Check that the configuration is valid, but don't start any servers.
+.It Fl v
+Verbose mode.
+Multiple
+.Fl v
+options increases the verbosity.
+.El
.Sh FILES
-.Bl -tag -width "/var/run/httpd.sockXX" -compact
+.Bl -tag -width "/etc/ssl/private/server.key" -compact
.It /etc/httpd.conf
Default configuration file.
+.It /etc/ssl/private/server.key
+Default SSL/TLS server key.
+.It /etc/ssl/server.crt
+Default SSL/TLS server certificate.
.It /var/run/httpd.sock
.Ux Ns -domain
socket used for communication with
.Nm .
+.It /var/www/logs/access.log
+Default access log file.
+.It /var/www/logs/error.log
+Default error log file.
.El
.Sh SEE ALSO
.Xr httpd.conf 5
.Sh HISTORY
+The
+.Nm
+program first appeared in
+.Ox 5.6 .
.Nm
is based on
.Xr relayd 8 .
@@ -49,6 +100,3 @@ The
.Nm
program was written by
.An Reyk Floeter Aq Mt reyk@openbsd.org .
-.Sh CAVEATS
-.Nm
-is not finished yet.