summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/httpd/Makefile.bsd-wrapper21
-rw-r--r--usr.sbin/httpd/conf/httpd.conf9
-rw-r--r--usr.sbin/httpd/conf/httpd.conf-dist13
-rw-r--r--usr.sbin/httpd/config.layout2
-rw-r--r--usr.sbin/httpd/htdocs/index.html15
-rw-r--r--usr.sbin/httpd/httpd.88
-rw-r--r--usr.sbin/httpd/src/support/apachectl.86
-rw-r--r--usr.sbin/httpd/src/support/dbmmanage.16
-rw-r--r--usr.sbin/httpd/src/support/htdigest.16
-rw-r--r--usr.sbin/httpd/src/support/htpasswd.16
-rw-r--r--usr.sbin/httpd/src/support/suexec.86
11 files changed, 37 insertions, 61 deletions
diff --git a/usr.sbin/httpd/Makefile.bsd-wrapper b/usr.sbin/httpd/Makefile.bsd-wrapper
index 585383dc2d3..3b6201941e0 100644
--- a/usr.sbin/httpd/Makefile.bsd-wrapper
+++ b/usr.sbin/httpd/Makefile.bsd-wrapper
@@ -1,5 +1,5 @@
# Build wrapper for Apache
-# $OpenBSD: Makefile.bsd-wrapper,v 1.65 2008/05/09 08:06:27 mbalmer Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.66 2008/06/07 01:59:36 jdixon Exp $
# Our lndir is hacked; specify a full path to avoid potential conflicts
# with the one installed with X11.
@@ -19,6 +19,7 @@ LNDIR= /usr/bin/lndir
# datadir: $prefix
# iconsdir: $prefix/icons
# htdocsdir: $prefix/htdocs
+# manualdir: $exec_prefix/share/doc/html/httpd
# cgidir: $prefix/cgi-bin
# includedir: $exec_prefix/lib/apache/include
# localstatedir: $prefix
@@ -35,6 +36,7 @@ HTTPD_LIBEXECDIR= ${HTTPD_EXEC_PREFIX}/lib/apache/modules
HTTPD_SYSCONFDIR= ${HTTPD_PREFIX}/conf
HTTPD_ICONSDIR= ${HTTPD_PREFIX}/icons
HTTPD_HTDOCSDIR= ${HTTPD_PREFIX}/htdocs
+HTTPD_MANUALDIR= ${HTTPD_EXEC_PREFIX}/share/doc/html/httpd
HTTPD_INCLUDEDIR= ${HTTPD_EXEC_PREFIX}/lib/apache/include
HTTPD_RUNDIR= ${HTTPD_PREFIX}/logs
HTTPD_LOGDIR= ${HTTPD_PREFIX}/logs
@@ -660,7 +662,7 @@ includes:
${.CURDIR}/$$i ${DESTDIR}${HTTPD_INCLUDEDIR}/xml; \
done
-install: maninstall
+install: maninstall htmlinstall
@-for i in ${BINFILES}; do \
j=`basename $$i`; \
echo "Installing ${DESTDIR}${HTTPD_BINDIR}/$$j"; \
@@ -741,12 +743,13 @@ cleanman:
@echo NOMAN is set
.endif
-man:
+htmlinstall:
@-for i in ${MANUALFILES}; do \
- j=`dirname $$i`; \
- echo "Installing ${DESTDIR}${HTTPD_HTDOCSDIR}/$$i"; \
+ j=`dirname $$i | sed 's;^manual/*;;'`; \
+ k=`basename $$i`; \
+ echo "Installing ${DESTDIR}${HTTPD_MANUALDIR}/$$j/$$k"; \
${INSTALL} ${INSTALL_COPY} -g ${BINGRP} -m 444 \
- htdocs/$$i ${DESTDIR}${HTTPD_HTDOCSDIR}/$$j/; \
+ ${.OBJDIR}/htdocs/$$i ${DESTDIR}${HTTPD_MANUALDIR}/$$j/; \
done
distribution:
@@ -766,12 +769,6 @@ distribution:
${INSTALL} ${INSTALL_COPY} -g ${BINGRP} -m 444 \
${.OBJDIR}/$$i ${DESTDIR}${HTTPD_PREFIX}/$$j/; \
done
- @-for i in ${MANUALFILES}; do \
- j=`dirname $$i`; \
- echo "Installing ${DESTDIR}${HTTPD_HTDOCSDIR}/$$i"; \
- ${INSTALL} ${INSTALL_COPY} -g ${BINGRP} -m 444 \
- ${.OBJDIR}/htdocs/$$i ${DESTDIR}${HTTPD_HTDOCSDIR}/$$j/; \
- done
@-for i in ${CGIFILES}; do \
j=`dirname $$i`; \
echo "Installing ${DESTDIR}${HTTPD_PREFIX}/$$i"; \
diff --git a/usr.sbin/httpd/conf/httpd.conf b/usr.sbin/httpd/conf/httpd.conf
index 5fb36f5eec1..e20f8d765cd 100644
--- a/usr.sbin/httpd/conf/httpd.conf
+++ b/usr.sbin/httpd/conf/httpd.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: httpd.conf,v 1.23 2008/04/25 12:06:45 sthen Exp $
+# $OpenBSD: httpd.conf,v 1.24 2008/06/07 01:59:36 jdixon Exp $
#
# Based upon the NCSA server configuration files originally by Rob McCool.
#
@@ -607,13 +607,6 @@ Alias /icons/ "/var/www/icons/"
Allow from all
</Directory>
-<Directory "/var/www/htdocs/manual">
- Options MultiViews
- AllowOverride None
- Order allow,deny
- Allow from all
-</Directory>
-
#
# ScriptAlias: This controls which directories contain server scripts.
# ScriptAliases are essentially the same as Aliases, except that
diff --git a/usr.sbin/httpd/conf/httpd.conf-dist b/usr.sbin/httpd/conf/httpd.conf-dist
index 5e159777b3b..e6af0ece430 100644
--- a/usr.sbin/httpd/conf/httpd.conf-dist
+++ b/usr.sbin/httpd/conf/httpd.conf-dist
@@ -572,19 +572,6 @@ ServerSignature On
Allow from all
</Directory>
- # This Alias will project the on-line documentation tree under /manual/
- # even if you change the DocumentRoot. Comment it if you don't want to
- # provide access to the on-line documentation.
- #
- Alias /manual/ "@@ServerRoot@@/htdocs/manual/"
-
- <Directory "@@ServerRoot@@/htdocs/manual">
- Options Indexes FollowSymlinks MultiViews
- AllowOverride None
- Order allow,deny
- Allow from all
- </Directory>
-
#
# ScriptAlias: This controls which directories contain server scripts.
# ScriptAliases are essentially the same as Aliases, except that
diff --git a/usr.sbin/httpd/config.layout b/usr.sbin/httpd/config.layout
index 77b5bd7f8c3..f2b037fdfea 100644
--- a/usr.sbin/httpd/config.layout
+++ b/usr.sbin/httpd/config.layout
@@ -274,7 +274,7 @@
datadir: $prefix
iconsdir: $prefix/icons
htdocsdir: $prefix/htdocs
- manualdir: $htdocsdir/manual
+ manualdir: $exec_prefix/share/doc/html/httpd
cgidir: $prefix/cgi-bin
includedir: $exec_prefix/lib/apache/include
localstatedir: $prefix
diff --git a/usr.sbin/httpd/htdocs/index.html b/usr.sbin/httpd/htdocs/index.html
index 5f53451f397..209d8fe68ec 100644
--- a/usr.sbin/httpd/htdocs/index.html
+++ b/usr.sbin/httpd/htdocs/index.html
@@ -29,12 +29,11 @@
<h1 align="center">Documentation</h1>
<p>
- The Apache <a href="manual/index.html" >documentation</a>
- has been included with this distribution.<br>
- Especially read the <a href="manual/mod/mod_ssl/">SSL documentation</a>
- carefully.<br>
- Also be sure to read the <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssl&format=html&sektion=8">ssl(8)</a> and
- <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=httpd&format=html">httpd(8)</a> manpages.
+ The Apache manual is available with distribution as part of the
+ <a href="http://www.openbsd.org/faq/faq4.html#FilesNeeded">misc</a> file set.<br>
+ Especially read the SSL documentation carefully within the manual, in addition to
+ the <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssl&format=html&sektion=8">ssl(8)</a> and
+ <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=httpd&format=html">httpd(8)</a> manual pages.
</p>
<h1 align="center">Graphics</h1>
<p>
@@ -55,8 +54,8 @@
</p>
<p>
These images are also appropriate for a webserver using
- <a href="manual/mod/mod_ssl/">mod_ssl</a> with
- <a href="http://www.openssl.org">openSSL</a> cryptography.
+ <a href="http://www.modssl.org/">mod_ssl</a> with
+ <a href="http://www.openssl.org/">openSSL</a> cryptography.
</p>
<p align="center">
<img src="manual/images/mod_ssl_sb.gif">
diff --git a/usr.sbin/httpd/httpd.8 b/usr.sbin/httpd/httpd.8
index 7e549e5a42f..2550169c1b6 100644
--- a/usr.sbin/httpd/httpd.8
+++ b/usr.sbin/httpd/httpd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: httpd.8,v 1.30 2008/05/21 08:57:38 mbalmer Exp $
+.\" $OpenBSD: httpd.8,v 1.31 2008/06/07 01:59:36 jdixon Exp $
.\" Copyright (c) 1995-1997 David Robinson. All rights reserved.
.\" Copyright (c) 1997-1999 The Apache Group. All rights reserved.
.\" Copyright (c) 1998-1999 Bob Beck. All rights reserved.
@@ -50,7 +50,7 @@
.\" Supercomputing Applications, University of Illinois, Urbana-Champaign.
.\" For more information on the Apache Group and the Apache HTTP server
.\" project, please see <http://www.apache.org/>.
-.Dd $Mdocdate: May 21 2008 $
+.Dd $Mdocdate: June 7 2008 $
.Dt HTTPD 8
.Os
.Sh NAME
@@ -150,7 +150,7 @@ This manual page only lists the command line arguments.
For details of the directives necessary to configure
.Nm ,
see the Apache manual in
-.Pa /var/www/htdocs/manual/ .
+.Pa /usr/share/doc/html/httpd/ .
Paths in this manual page reflect those
compiled into
.Nm
@@ -304,4 +304,4 @@ They must, however, be readable by this user.
.Xr suexec 8
.Pp
The Apache manual:
-.Pa /var/www/htdocs/manual/ .
+.Pa /usr/share/doc/html/httpd/ .
diff --git a/usr.sbin/httpd/src/support/apachectl.8 b/usr.sbin/httpd/src/support/apachectl.8
index fabd6da2407..9f47b3c0cb3 100644
--- a/usr.sbin/httpd/src/support/apachectl.8
+++ b/usr.sbin/httpd/src/support/apachectl.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: apachectl.8,v 1.8 2007/05/31 19:20:24 jmc Exp $
+.\" $OpenBSD: apachectl.8,v 1.9 2008/06/07 01:59:36 jdixon Exp $
.\"
.\" ====================================================================
.\" The Apache Software License, Version 1.1
@@ -57,7 +57,7 @@
.\" originally written at the National Center for Supercomputing Applications,
.\" University of Illinois, Urbana-Champaign.
.\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 7 2008 $
.Dt APACHECTL 8
.Os
.Sh NAME
@@ -183,4 +183,4 @@ only the error from the last one is reported.
.Xr ssl 8
.Pp
Full documentation for httpd can be found at
-.Pa /var/www/htdocs/manual/ .
+.Pa /usr/share/doc/html/httpd/ .
diff --git a/usr.sbin/httpd/src/support/dbmmanage.1 b/usr.sbin/httpd/src/support/dbmmanage.1
index c9eb8aa327d..4ed4d947adc 100644
--- a/usr.sbin/httpd/src/support/dbmmanage.1
+++ b/usr.sbin/httpd/src/support/dbmmanage.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: dbmmanage.1,v 1.10 2007/05/31 19:20:24 jmc Exp $
+.\" $OpenBSD: dbmmanage.1,v 1.11 2008/06/07 01:59:36 jdixon Exp $
.\"
.\" ====================================================================
.\" The Apache Software License, Version 1.1
@@ -57,7 +57,7 @@
.\" originally written at the National Center for Supercomputing Applications,
.\" University of Illinois, Urbana-Champaign.
.\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 7 2008 $
.Dt DBMMANAGE 1
.Os
.Sh NAME
@@ -86,7 +86,7 @@ For details of the directives necessary to configure user authentication in
.Xr httpd 8 ,
see
the Apache manual, which can be found in
-.Pa /var/www/htdocs/manual/ .
+.Pa /usr/share/doc/html/httpd/ .
.Pp
The options are as follows:
.Bl -tag -width "encpasswordXX"
diff --git a/usr.sbin/httpd/src/support/htdigest.1 b/usr.sbin/httpd/src/support/htdigest.1
index 7915a8396e7..cd2b519d258 100644
--- a/usr.sbin/httpd/src/support/htdigest.1
+++ b/usr.sbin/httpd/src/support/htdigest.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: htdigest.1,v 1.9 2007/05/31 19:20:24 jmc Exp $
+.\" $OpenBSD: htdigest.1,v 1.10 2008/06/07 01:59:36 jdixon Exp $
.\"
.\" ====================================================================
.\" The Apache Software License, Version 1.1
@@ -57,7 +57,7 @@
.\" originally written at the National Center for Supercomputing Applications,
.\" University of Illinois, Urbana-Champaign.
.\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 7 2008 $
.Dt HTDIGEST 1
.Os
.Sh NAME
@@ -84,7 +84,7 @@ For details of the directives necessary to
configure digest authentication in
.Xr httpd 8 ,
see the Apache manual, which can be found at
-.Pa /var/www/htdocs/manual/ .
+.Pa /usr/share/doc/html/httpd/ .
.Pp
The options are as follows:
.Bl -tag -width "passwordfileXX"
diff --git a/usr.sbin/httpd/src/support/htpasswd.1 b/usr.sbin/httpd/src/support/htpasswd.1
index 294df750054..ca5dccb4a66 100644
--- a/usr.sbin/httpd/src/support/htpasswd.1
+++ b/usr.sbin/httpd/src/support/htpasswd.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: htpasswd.1,v 1.15 2007/05/31 19:20:24 jmc Exp $
+.\" $OpenBSD: htpasswd.1,v 1.16 2008/06/07 01:59:36 jdixon Exp $
.\"
.\" ====================================================================
.\" The Apache Software License, Version 1.1
@@ -57,7 +57,7 @@
.\" originally written at the National Center for Supercomputing Applications,
.\" University of Illinois, Urbana-Champaign.
.\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 7 2008 $
.Dt HTPASSWD 1
.Os
.Sh NAME
@@ -134,7 +134,7 @@ For details of the directives necessary to configure user authentication in
.Xr httpd 8 ,
see
the Apache manual, which can be found in
-.Pa /var/www/htdocs/manual/ .
+.Pa /usr/share/doc/html/httpd/ .
.Pp
The options are as follows:
.Bl -tag -width "passwordfileXX"
diff --git a/usr.sbin/httpd/src/support/suexec.8 b/usr.sbin/httpd/src/support/suexec.8
index 937be87303d..770ca9f05fe 100644
--- a/usr.sbin/httpd/src/support/suexec.8
+++ b/usr.sbin/httpd/src/support/suexec.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: suexec.8,v 1.13 2007/05/31 19:20:24 jmc Exp $
+.\" $OpenBSD: suexec.8,v 1.14 2008/06/07 01:59:36 jdixon Exp $
.\" ====================================================================
.\" The Apache Software License, Version 1.1
.\"
@@ -56,7 +56,7 @@
.\" originally written at the National Center for Supercomputing Applications,
.\" University of Illinois, Urbana-Champaign.
.\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 7 2008 $
.Dt SUEXEC 8
.Os
.Sh NAME
@@ -108,4 +108,4 @@ so a change of file mode is necessary to enable it:
.Xr httpd 8
.Pp
Apache suEXEC Support:
-.Pa /var/www/htdocs/manual/suexec.html
+.Pa /usr/share/doc/html/httpd/suexec.html
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-17 15:14:40 +0000