From c4ce8fe319cf93f03ba2d51b200647eeed67b2cb Mon Sep 17 00:00:00 2001 From: Bob Beck Date: Thu, 26 Mar 1998 07:08:42 +0000 Subject: Move man page - get rid of build artifact - have makefile install man page. --- usr.sbin/httpd/Makefile | 2 + usr.sbin/httpd/httpd.8 | 129 ++++++++++++++++++++++++++++++++ usr.sbin/httpd/src/Makefile.bsd-wrapper | 9 +-- usr.sbin/httpd/src/htconf.634 | 25 ------- usr.sbin/httpd/src/httpd.8 | 129 -------------------------------- 5 files changed, 133 insertions(+), 161 deletions(-) create mode 100644 usr.sbin/httpd/httpd.8 delete mode 100644 usr.sbin/httpd/src/htconf.634 delete mode 100644 usr.sbin/httpd/src/httpd.8 diff --git a/usr.sbin/httpd/Makefile b/usr.sbin/httpd/Makefile index e8d846f0915..03144984e61 100644 --- a/usr.sbin/httpd/Makefile +++ b/usr.sbin/httpd/Makefile @@ -1,3 +1,4 @@ +MAN = httpd.8 SUBDIR+=src WWWROOT=/var/www CONFFILES= \ @@ -111,3 +112,4 @@ distribution: done .include +.include diff --git a/usr.sbin/httpd/httpd.8 b/usr.sbin/httpd/httpd.8 new file mode 100644 index 00000000000..cd31ed7c3ec --- /dev/null +++ b/usr.sbin/httpd/httpd.8 @@ -0,0 +1,129 @@ +.TH httpd 8 "February 1997" +.\" Copyright (c) 1995-1997 David Robinson. All rights reserved. +.\" Copyright (c) 1997 The Apache Group. All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in +.\" the documentation and/or other materials provided with the +.\" distribution. +.\" +.\" 3. All advertising materials mentioning features or use of this +.\" software must display the following acknowledgment: +.\" "This product includes software developed by the Apache Group +.\" for use in the Apache HTTP server project (http://www.apache.org/)." +.\" +.\" 4. The names "Apache Server" and "Apache Group" must not be used to +.\" endorse or promote products derived from this software without +.\" prior written permission. +.\" +.\" 5. Redistributions of any form whatsoever must retain the following +.\" acknowledgment: +.\" "This product includes software developed by the Apache Group +.\" for use in the Apache HTTP server project (http://www.apache.org/)." +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY +.\" EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR +.\" ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +.\" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +.\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +.\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED +.\" OF THE POSSIBILITY OF SUCH DAMAGE. +.\" ==================================================================== +.\" +.\" This software consists of voluntary contributions made by many +.\" individuals on behalf of the Apache Group and was originally based +.\" on public domain software written at the National Center for +.\" Supercomputing Applications, University of Illinois, Urbana-Champaign. +.\" For more information on the Apache Group and the Apache HTTP server +.\" project, please see . +.SH NAME +httpd \- Apache hypertext transfer protocol server +.SH SYNOPSIS +.B httpd +[ +.B \-hlvX? +] [ +.BI \-d " serverroot" +] [ +.BI \-f " config" +] +.SH DESCRIPTION +.B httpd +is the Apache HyperText Transfer Protocol (HTTP) server program. It is +designed to be run as a standalone daemon process. When used like this +is will create a pool of child processes to handle requests. To stop +it, send a TERM signal to the initial (parent) process. The PID of +this process is written to a file as given in the configuration file. +Alternatively +.B httpd +may be invoked by the Internet daemon inetd(8) each +time a connection to the HTTP service is made. Normally this service +can be enabled for startup on OpenBSD by editing \fB/etc/rc.conf\fP. +.PP +This manual page only lists the command line arguments. For details +of the directives necessary to configure httpd see the Apache manual, +which is part of the Apache distribution or can be found at +http://www.apache.org/, or in \fB/var/www/htdocs/manual\fP. +Paths in this manual page reflect those +compiled into httpd by default with OpenBSD. +.SH OPTIONS +.TP 12 +.BI \-d " serverroot" +Set the initial value for the ServerRoot directive to \fIserverroot\fP. This +can be overridden by the ServerRoot command in the configuration file. The +default is \fB/var/www\fP. +.TP +.BI \-f " config" +Execute the commands in the file \fIconfig\fP on startup. If \fIconfig\fP +does not begin with a /, then it is taken to be a path relative to +the ServerRoot. The default is \fBconf/httpd.conf\fP. +.TP +.B \-h +Output a list of directives together with expected arguments and +places where the directive is valid. +.TP +.B \-l +Output a list of modules compiled into the server. +.TP +.B \-X +Run in single-process mode, for internal debugging purposes only; the daemon +does not detach from the terminal or fork any children. Do NOT use this mode +to provide ordinary web service. +.TP +.B \-v +Print the version of httpd, and then exit. +.TP +.B \-? +Print a list of the httpd options, and then exit. +.SH FILES +.PD 0 +.B /var/www/conf/httpd.conf +.br +.B /var/www/conf/srm.conf +.br +.B /var/www/conf/access.conf +.br +.B /var/www/conf/mime.types +.br +.B /var/www/logs/error_log +.br +.B /var/www/logs/access_log +.br +.B /var/www/logs/httpd.pid +.br +.B /etc/rc.conf +.PD +.SH SEE ALSO +.BR inetd (8). diff --git a/usr.sbin/httpd/src/Makefile.bsd-wrapper b/usr.sbin/httpd/src/Makefile.bsd-wrapper index bc836a9c85b..4ec10180b37 100644 --- a/usr.sbin/httpd/src/Makefile.bsd-wrapper +++ b/usr.sbin/httpd/src/Makefile.bsd-wrapper @@ -1,10 +1,10 @@ .include - PROG=httpd BINDIR=/usr/sbin BINOWN=root BINGRP=daemon +#MAN= httpd.8 all: Makefile ${MAKE} @@ -20,12 +20,7 @@ config: .FORCE Makefile: helpers/GuessOS sh ${.CURDIR}/Configure -file ${.CURDIR}/Configuration -make ${.CURDIR}/Makefile.tmpl -# apache has no man pages in the dist - -maninistall: - @echo No man pages for apache - -install: maninistall +install: ${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ${PROG} ${BINDIR} clean cleandir: diff --git a/usr.sbin/httpd/src/htconf.634 b/usr.sbin/httpd/src/htconf.634 deleted file mode 100644 index e8e7e53fdb7..00000000000 --- a/usr.sbin/httpd/src/htconf.634 +++ /dev/null @@ -1,25 +0,0 @@ -EXTRA_CFLAGS= -EXTRA_LFLAGS= -EXTRA_LIBS= -EXTRA_INCLUDES= -##Rule:STATUS=yes -##Rule:SOCKS4=no -##Rule:IRIXNIS=no -##Rule:WANTHSREGEX=default -Module env_module mod_env.o -Module config_log_module mod_log_config.o -Module mime_module mod_mime.o -Module negotiation_module mod_negotiation.o -Module includes_module mod_include.o -Module dir_module mod_dir.o -Module cgi_module mod_cgi.o -Module asis_module mod_asis.o -Module imap_module mod_imap.o -Module action_module mod_actions.o -Module userdir_module mod_userdir.o -Module alias_module mod_alias.o -Module access_module mod_access.o -Module auth_module mod_auth.o -Module db_auth_module mod_auth_db.o -Module dbm_auth_module mod_auth_dbm.o -Module browser_module mod_browser.o diff --git a/usr.sbin/httpd/src/httpd.8 b/usr.sbin/httpd/src/httpd.8 deleted file mode 100644 index cd31ed7c3ec..00000000000 --- a/usr.sbin/httpd/src/httpd.8 +++ /dev/null @@ -1,129 +0,0 @@ -.TH httpd 8 "February 1997" -.\" Copyright (c) 1995-1997 David Robinson. All rights reserved. -.\" Copyright (c) 1997 The Apache Group. All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in -.\" the documentation and/or other materials provided with the -.\" distribution. -.\" -.\" 3. All advertising materials mentioning features or use of this -.\" software must display the following acknowledgment: -.\" "This product includes software developed by the Apache Group -.\" for use in the Apache HTTP server project (http://www.apache.org/)." -.\" -.\" 4. The names "Apache Server" and "Apache Group" must not be used to -.\" endorse or promote products derived from this software without -.\" prior written permission. -.\" -.\" 5. Redistributions of any form whatsoever must retain the following -.\" acknowledgment: -.\" "This product includes software developed by the Apache Group -.\" for use in the Apache HTTP server project (http://www.apache.org/)." -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY -.\" EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR -.\" ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -.\" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -.\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -.\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -.\" OF THE POSSIBILITY OF SUCH DAMAGE. -.\" ==================================================================== -.\" -.\" This software consists of voluntary contributions made by many -.\" individuals on behalf of the Apache Group and was originally based -.\" on public domain software written at the National Center for -.\" Supercomputing Applications, University of Illinois, Urbana-Champaign. -.\" For more information on the Apache Group and the Apache HTTP server -.\" project, please see . -.SH NAME -httpd \- Apache hypertext transfer protocol server -.SH SYNOPSIS -.B httpd -[ -.B \-hlvX? -] [ -.BI \-d " serverroot" -] [ -.BI \-f " config" -] -.SH DESCRIPTION -.B httpd -is the Apache HyperText Transfer Protocol (HTTP) server program. It is -designed to be run as a standalone daemon process. When used like this -is will create a pool of child processes to handle requests. To stop -it, send a TERM signal to the initial (parent) process. The PID of -this process is written to a file as given in the configuration file. -Alternatively -.B httpd -may be invoked by the Internet daemon inetd(8) each -time a connection to the HTTP service is made. Normally this service -can be enabled for startup on OpenBSD by editing \fB/etc/rc.conf\fP. -.PP -This manual page only lists the command line arguments. For details -of the directives necessary to configure httpd see the Apache manual, -which is part of the Apache distribution or can be found at -http://www.apache.org/, or in \fB/var/www/htdocs/manual\fP. -Paths in this manual page reflect those -compiled into httpd by default with OpenBSD. -.SH OPTIONS -.TP 12 -.BI \-d " serverroot" -Set the initial value for the ServerRoot directive to \fIserverroot\fP. This -can be overridden by the ServerRoot command in the configuration file. The -default is \fB/var/www\fP. -.TP -.BI \-f " config" -Execute the commands in the file \fIconfig\fP on startup. If \fIconfig\fP -does not begin with a /, then it is taken to be a path relative to -the ServerRoot. The default is \fBconf/httpd.conf\fP. -.TP -.B \-h -Output a list of directives together with expected arguments and -places where the directive is valid. -.TP -.B \-l -Output a list of modules compiled into the server. -.TP -.B \-X -Run in single-process mode, for internal debugging purposes only; the daemon -does not detach from the terminal or fork any children. Do NOT use this mode -to provide ordinary web service. -.TP -.B \-v -Print the version of httpd, and then exit. -.TP -.B \-? -Print a list of the httpd options, and then exit. -.SH FILES -.PD 0 -.B /var/www/conf/httpd.conf -.br -.B /var/www/conf/srm.conf -.br -.B /var/www/conf/access.conf -.br -.B /var/www/conf/mime.types -.br -.B /var/www/logs/error_log -.br -.B /var/www/logs/access_log -.br -.B /var/www/logs/httpd.pid -.br -.B /etc/rc.conf -.PD -.SH SEE ALSO -.BR inetd (8). -- cgit v1.2.3