summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Herbert <stuart@gentoo.org>2003-12-15 20:24:07 +0000
committerStuart Herbert <stuart@gentoo.org>2003-12-15 20:24:07 +0000
commitfcfdc202a20c7029fe8491251c147ff007cffeb4 (patch)
treee0518d683aae463d3da2f9d664dba0dfa65eb536 /eclass/webapp-apache.eclass
parentFix for bug #32636 (diff)
downloadgentoo-2-fcfdc202a20c7029fe8491251c147ff007cffeb4.tar.gz
gentoo-2-fcfdc202a20c7029fe8491251c147ff007cffeb4.tar.bz2
gentoo-2-fcfdc202a20c7029fe8491251c147ff007cffeb4.zip
Fix for bug #32636
Diffstat (limited to 'eclass/webapp-apache.eclass')
-rw-r--r--eclass/webapp-apache.eclass19
1 files changed, 15 insertions, 4 deletions
diff --git a/eclass/webapp-apache.eclass b/eclass/webapp-apache.eclass
index f0b799622adb..4c5bd2ea5a6f 100644
--- a/eclass/webapp-apache.eclass
+++ b/eclass/webapp-apache.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/webapp-apache.eclass,v 1.12 2003/11/27 06:37:20 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/webapp-apache.eclass,v 1.13 2003/12/15 20:23:27 stuart Exp $
#
# Author: Stuart Herbert <stuart@gentoo.org>
#
@@ -53,6 +53,20 @@ function webapp-detect () {
return 0
}
+function webapp-mkdirs () {
+ webapp-determine-htdocsdir
+ webapp-determine-cgibindir
+
+ keepdir "$HTTPD_ROOT"
+ fowners "$HTTPD_USER":"$HTTPD_GROUP" "$HTTPD_ROOT"
+ fperms 755 "$HTTPD_ROOT"
+
+ # explicit return here to ensure the return code
+ # from above isn't returned instead
+
+ return 0
+}
+
function webapp-determine-htdocsdir ()
{
webapp-determine-installowner
@@ -61,9 +75,6 @@ function webapp-determine-htdocsdir ()
# [ -z "${HTTPD_ROOT}" ] && HTTPD_ROOT="/home/httpd/htdocs/"
# temporary fix for webapps
HTTPD_ROOT="/var/www/localhost/htdocs/"
- keepdir "$HTTPD_ROOT"
- fowners "$HTTPD_USER":"$HTTPD_GROUP" "$HTTPD_ROOT"
- fperms 755 "$HTTPD_ROOT"
}
function webapp-determine-cgibindir ()