2007-06-18 03:51:50 -04:00
$OpenBSD: patch-doc_hiawatha_1,v 1.4 2007/06/18 07:51:50 ajacoutot Exp $
--- doc/hiawatha.1.orig Fri Jun 15 10:41:04 2007
+++ doc/hiawatha.1 Mon Jun 18 09:42:06 2007
2007-04-25 09:55:58 -04:00
@@ -23,7 +23,7 @@ hiawatha \- Advanced and secure webserver
2006-12-31 05:32:42 -05:00
Hiawatha is a secure webserver for Unix. It has been written with 'being secure' as its main goal. Hiawatha has lots of features that no other webserver has. This and the fact that Hiawatha's source code is free of security-bugs, makes Hiawatha the most secure webserver available.
.br
-Hiawatha has been tested and runs perfectly on Linux, FreeBSD, MacOS X and Cygwin.
+Hiawatha has been tested and runs perfectly on Linux, {Open,Free}BSD, MacOS X and Cygwin.
.\" ==========[ Configuration files ]==========================================
.SH CONFIGURATION FILES
2007-04-25 09:55:58 -04:00
@@ -150,7 +150,7 @@ Example: CGIhandler = /usr/bin/php4-cgi:php,php4
2006-12-31 05:32:42 -05:00
.B CGIwrapper = <CGI wrapper>
2007-03-26 02:57:56 -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
+Example: CGIwrapper = !!LOCALBASE!!/sbin/cgi-wrapper
2006-12-31 05:32:42 -05:00
.TP
2007-03-26 02:57:56 -04:00
.B CommandChannel = <portnumber>,<MD5 hash of password>
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.
2007-04-25 09:55:58 -04:00
@@ -183,7 +183,7 @@ Example: GarbageLogfile = /var/log/hiawatha/garbage.lo
2006-12-31 05:32:42 -05:00
.B Include <filename>
Include another configurationfile.
.br
-Example: Include /etc/hiawatha/hosts.conf
+Example: Include !!SYSCONFDIR!!/hiawatha/hosts.conf
.TP
.B KickOnBan = yes|no
Close all other connections that originate from the same IP in case of a ban.
2007-04-25 09:55:58 -04:00
@@ -228,7 +228,7 @@ Default = /var/run/hiawatha.pid, example: PIDfile = /u
2006-12-31 05:32:42 -05:00
.B ServerId = <userid>|<userid>:<groupid>[,<groupid>, ...]
2007-03-26 02:57:56 -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 'root' are not allowed here.
2006-12-31 05:32:42 -05:00
.br
-Default = 65534:65534, example: ServerId = www-data
+Default = 579:579, example: ServerId = www-data
.TP
.B ServerKey = <SSL certificate file>
The file containing the SSL private key and certificate. These will be used for all SSL bindings that don't have their own certificate file. See ServerKey and UseSSL in the BINDING section.
2007-04-25 09:55:58 -04:00
@@ -256,7 +256,7 @@ Default = /var/log/hiawatha/system.log, example: Syste
2007-03-26 02:57:56 -04:00
.B ThrottleConfig = <configurationfile>
The location of the throttle configurationfile. It the path is omitted, Hiawatha's configurationfile directory will be used.
.br
-Default = throttle.conf, example: ThrottleConfig = /etc/somewhere/throttle.conf
+Default = throttle.conf, example: ThrottleConfig = /etc/somewhere/throttle.conf
.TP
.B TimeForCGI = <time>
Maximum time in seconds for a CGI-process to finish its job.
2007-06-18 03:51:50 -04:00
@@ -633,13 +633,13 @@ 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.
+Specify the mimetypes of files in !!SYSCONFDIR!!/hiawatha/mimetypes.conf.
.TP
.B <mimetype> <extension> [<extension> ...]
Example: image/jpeg jpg jpeg
.SH CONTROL UPLOADSPEED
-The uploadspeed of some files can be controled via /etc/hiawatha/throttle.conf.
+The uploadspeed of some files can be controled via !!SYSCONFDIR!!/hiawatha/throttle.conf.
.TP
.B <main-mimetype>/[<sub-mimetype>]:<uploadspeed in kB/s>
Example: audio/mpeg:30 or video/:30
2007-06-18 03:51:50 -04:00
@@ -666,15 +666,15 @@ Will unban all clients.
2006-12-31 05:32:42 -05:00
Will disconnect all clients.
.SH FILES
-.B /usr/sbin/hiawatha
+.B !!LOCALBASE!!/sbin/hiawatha
.br
-.B /etc/hiawatha/httpd.conf
+.B !!SYSCONFDIR!!/hiawatha/httpd.conf
.br
-.B /etc/hiawatha/mime.types
+.B !!SYSCONFDIR!!/hiawatha/mime.types
.br
-.B /etc/hiawatha/throttle.conf
+.B !!SYSCONFDIR!!/hiawatha/throttle.conf
.br
2007-03-26 02:57:56 -04:00
-.B /etc/hiawatha/cgi-wrapper.conf
+.B !!SYSCONFDIR!!/hiawatha/cgi-wrapper.conf
2006-12-31 05:32:42 -05:00
.SH SEE ALSO