2009-09-22 05:29:25 -04:00
$OpenBSD: patch-doc_hiawatha_1_in,v 1.7 2009/09/22 09:29:25 ajacoutot Exp $
--- doc/hiawatha.1.in.orig Tue Sep 22 11:02:23 2009
+++ doc/hiawatha.1.in Tue Sep 22 11:04:59 2009
2008-05-29 03:53:03 -04:00
@@ -150,12 +150,12 @@ Example: CGIextension = cgi
2008-04-29 04:47:43 -04:00
.B CGIhandler = <CGI handler>:<extension>[, <extension>, ...]
Specify the handler for a CGI extension. A handler is an executable which will 'run' the CGI script.
.br
-Example: CGIhandler = /usr/bin/php4-cgi:php,php4
2008-05-29 03:53:03 -04:00
+Example: CGIhandler = ${LOCALBASE}/bin/php-fastcgi:php,php5
2008-04-29 04:47:43 -04:00
.TP
2006-12-31 05:32:42 -05:00
.B CGIwrapper = <CGI wrapper>
2007-07-06 08:09:12 -04:00
Specify the wrapper for CGI processes. A secure CGI wrapper is included in the Hiawatha package (see cgi-wrapper(1) for more information).
2006-12-31 05:32:42 -05:00
.br
2007-03-26 02:57:56 -04:00
-Example: CGIwrapper = /usr/sbin/cgi-wrapper
2008-05-29 03:53:03 -04:00
+Example: CGIwrapper = ${PREFIX}/sbin/cgi-wrapper
2006-12-31 05:32:42 -05:00
.TP
2008-09-27 07:34:07 -04:00
.B CommandChannel = <portnumber>, <MD5 hash of password>
2007-03-26 02:57:56 -04:00
The port and the password for the CommandChannel. You can use telnet to connect to the CommandChannel (localhost:<portnumber>). Type 'help' in the CommandChannel for more information.
2008-05-29 03:53:03 -04:00
@@ -188,7 +188,7 @@ Example: GarbageLogfile = @logdir@/garbage.log
2008-07-23 06:41:00 -04:00
.B Include <filename>|<directory>
Include another configurationfile or configurationfiles in a directory.
2006-12-31 05:32:42 -05:00
.br
-Example: Include /etc/hiawatha/hosts.conf
2008-05-29 03:53:03 -04:00
+Example: Include ${SYSCONFDIR}/hiawatha/hosts.conf
2006-12-31 05:32:42 -05:00
.TP
.B KickOnBan = yes|no
Close all other connections that originate from the same IP in case of a ban.
2008-09-27 07:34:07 -04:00
@@ -245,7 +245,7 @@ Default = 0, example: ReconnectDelay = 3
2006-12-31 05:32:42 -05:00
.B ServerId = <userid>|<userid>:<groupid>[,<groupid>, ...]
2007-10-14 05:09:45 -04:00
The userid and groupid(s) the server will change to. If only a userid is specified, the groupid(s) will be looked up in /etc/passwd and /etc/group. The userid en groupid of user root are not allowed here.
2006-12-31 05:32:42 -05:00
.br
-Default = 65534:65534, example: ServerId = www-data
2009-09-22 05:29:25 -04:00
+Default = 579:579, example: ServerId = _hiawatha
2006-12-31 05:32:42 -05:00
.TP
2009-07-23 01:54:15 -04:00
.B ServerRoot = <directory>
Rootdirectory for the webserver. Hiawatha will chroot() to this directory after reading the configurationfile and writing the PID file. Cannot be used in combination with UserWebsites.
2009-09-22 05:29:25 -04:00
@@ -821,7 +821,7 @@ and
2007-03-26 02:57:56 -04:00
.B UseGZfile
2006-12-31 05:32:42 -05:00
.SH MIMETYPES
-Specify the mimetypes of files in /etc/hiawatha/mimetypes.conf.
2008-05-29 03:53:03 -04:00
+Specify the mimetypes of files in ${SYSCONFDIR}/hiawatha/mimetypes.conf.
2006-12-31 05:32:42 -05:00
.TP
.B <mimetype> <extension> [<extension> ...]
2007-07-06 08:09:12 -04:00
Example: image/jpeg jpg jpeg jpe
2009-09-22 05:29:25 -04:00
@@ -848,15 +848,15 @@ Unban all IP addresses.
2009-07-23 01:54:15 -04:00
Clear the internal cache (requires that Hiawatha was not compiled with --disable-cache).
2006-12-31 05:32:42 -05:00
.SH FILES
-.B /usr/sbin/hiawatha
2008-05-29 03:53:03 -04:00
+.B ${PREFIX}/sbin/hiawatha
2006-12-31 05:32:42 -05:00
.br
2009-09-22 05:29:25 -04:00
-.B /etc/hiawatha/hiawatha.conf
+.B ${SYSCONFDIR}/hiawatha/hiawatha.conf
2006-12-31 05:32:42 -05:00
.br
-.B /etc/hiawatha/mime.types
2008-05-29 03:53:03 -04:00
+.B ${SYSCONFDIR}/hiawatha/mime.types
2006-12-31 05:32:42 -05:00
.br
2007-03-26 02:57:56 -04:00
-.B /etc/hiawatha/cgi-wrapper.conf
2008-05-29 03:53:03 -04:00
+.B ${SYSCONFDIR}/hiawatha/cgi-wrapper.conf
2007-07-06 08:09:12 -04:00
.br
-.B /etc/hiawatha/php-fcgi.conf
2008-05-29 03:53:03 -04:00
+.B ${SYSCONFDIR}/hiawatha/php-fcgi.conf
2007-03-26 02:57:56 -04:00
2006-12-31 05:32:42 -05:00
.SH SEE ALSO