summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChuck Short <zul@gentoo.org>2004-04-04 01:52:12 +0000
committerChuck Short <zul@gentoo.org>2004-04-04 01:52:12 +0000
commit793117f5d3105cd40ce50464faa66c0779e20cdd (patch)
tree9ae76bf818f6c88a8c9f6123c0ef2b4e30562d8e /net-www
parentUpdated headers, added metadata.xml, turned off ssl for virtualhosts on port ... (diff)
downloadgentoo-2-793117f5d3105cd40ce50464faa66c0779e20cdd.tar.gz
gentoo-2-793117f5d3105cd40ce50464faa66c0779e20cdd.tar.bz2
gentoo-2-793117f5d3105cd40ce50464faa66c0779e20cdd.zip
Added multiviews for /usr/share/doc, closes #30862.
Diffstat (limited to 'net-www')
-rw-r--r--net-www/apache/ChangeLog6
-rw-r--r--net-www/apache/apache-2.0.48.ebuild8
-rw-r--r--net-www/apache/files/conf/commonapache.conf4
3 files changed, 14 insertions, 4 deletions
diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index d214a3f66afe..baeec7aed504 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-www/apache
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.114 2004/04/03 07:23:59 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.115 2004/04/04 01:52:12 zul Exp $
+
+ 03 Apr 2004; Chuck Short <zul@gentoo.org> apache-2.0.48.ebuild,
+ files/conf/commonapache.conf:
+ Added multiviews for /usr/share/doc. Closes #30862.
02 Apr 2004; Robin H. Johnson <robbat2@gentoo.org> apache-2.0.49.ebuild:
fix bug #46585.
diff --git a/net-www/apache/apache-2.0.48.ebuild b/net-www/apache/apache-2.0.48.ebuild
index 546c0f8848e4..7904130a37df 100644
--- a/net-www/apache/apache-2.0.48.ebuild
+++ b/net-www/apache/apache-2.0.48.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.48.ebuild,v 1.4 2004/01/15 03:55:19 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.48.ebuild,v 1.5 2004/04/04 01:52:12 zul Exp $
inherit flag-o-matic
has_version =sys-libs/glibc-2.2* && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
@@ -234,6 +234,12 @@ src_install () {
#drop in a convenient link to the manual
dosym /usr/share/doc/${PF}/manual ${DATADIR}/htdocs/manual
+ if [ -d /etc/logroate.d ]
+ then
+ insinto /etc/logrotate.d
+ doins ${FILESDIR}/apache2
+ fi
+
#SLOT=2!!!
cd ${D}
mv -v usr/sbin/apachectl usr/sbin/apache2ctl
diff --git a/net-www/apache/files/conf/commonapache.conf b/net-www/apache/files/conf/commonapache.conf
index cda503d744c6..c40d4ad4857e 100644
--- a/net-www/apache/files/conf/commonapache.conf
+++ b/net-www/apache/files/conf/commonapache.conf
@@ -1,5 +1,5 @@
### /etc/apache/conf/commonapache.conf
-### $Id: commonapache.conf,v 1.5 2003/09/27 04:47:18 woodchip Exp $
+### $Id: commonapache.conf,v 1.6 2004/04/04 01:52:12 zul Exp $
###
### Common server configuration.
###
@@ -692,7 +692,7 @@ ErrorDocument 404 "The document you requested has not been installed on your sys
</Directory>
<Directory /usr/share/doc>
- Options Indexes FollowSymLinks
+ Options Indexes FollowSymLinks MultiViews
Order deny,allow
Deny from all
Allow from 127.0.0.1