diff options
| author | jlam <jlam@pkgsrc.org> | 2001-05-08 17:28:08 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-05-08 17:28:08 +0000 |
| commit | a7a1b31121492116dee3cc5407984f0f5c14b785 (patch) | |
| tree | 9a0eeedb90aaa2f45138568632c7493b16313ea9 /www | |
| parent | c91357e86ffd91abb80cc0feabd15d6a7deb06b2 (diff) | |
| download | pkgsrc-a7a1b31121492116dee3cc5407984f0f5c14b785.tar.gz | |
Allow changing document root for suexec through ${APACHE_SUEXEC_DOCROOT}.
Closes pkg/12852 by Eric Schnoebelen <eric@milo.cirr.com>.
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache/Makefile | 8 | ||||
| -rw-r--r-- | www/apache6/Makefile | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/www/apache/Makefile b/www/apache/Makefile index 5799d5fe0bf..b796555bbc6 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.67 2001/04/29 21:21:13 jlam Exp $ +# $NetBSD: Makefile,v 1.68 2001/05/08 17:28:09 jlam Exp $ # # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of # code hooks that allow mod_ssl to be compiled separately later, if desired). @@ -43,12 +43,14 @@ BUILD_DEFS+= APACHE_SYSCONFDIR .if defined(APACHE_SUEXEC) && ${APACHE_SUEXEC} == YES APACHE_USER?= www +APACHE_SUEXEC_DOCROOT?= ${LOCALBASE}/share/httpd/htdocs SUEXEC_PATH= /bin:/usr/bin:${PREFIX}/bin:/usr/local/bin CONFIGURE_ARGS+= --enable-suexec \ --suexec-caller=${APACHE_USER} \ - --suexec-safepath='${SUEXEC_PATH}' + --suexec-safepath='${SUEXEC_PATH}' \ + --suexec-docroot=${APACHE_SUEXEC_DOCROOT} PLIST_SRC= ${PKGDIR}/PLIST.suexec -BUILD_DEFS+= APACHE_USER +BUILD_DEFS+= APACHE_USER APACHE_SUEXEC_DOCROOT .endif .if !defined(NOPIC) diff --git a/www/apache6/Makefile b/www/apache6/Makefile index c5514a8a02b..67d2a80dabe 100644 --- a/www/apache6/Makefile +++ b/www/apache6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2001/04/29 21:21:13 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2001/05/08 17:28:09 jlam Exp $ # # This package does not compile in mod_ssl support hooks, as it conflicts # with IPv6-enable patch. @@ -51,12 +51,14 @@ BUILD_DEFS+= APACHE_SYSCONFDIR .if defined(APACHE_SUEXEC) && ${APACHE_SUEXEC} == YES APACHE_USER?= www +APACHE_SUEXEC_DOCROOT?= ${LOCALBASE}/share/httpd/htdocs SUEXEC_PATH= /bin:/usr/bin:${PREFIX}/bin:/usr/local/bin CONFIGURE_ARGS+= --enable-suexec \ --suexec-caller=${APACHE_USER} \ - --suexec-safepath='${SUEXEC_PATH}' + --suexec-safepath='${SUEXEC_PATH}' \ + --suexec-docroot=${APACHE_SUEXEC_DOCROOT} PLIST_SRC= ${PKGDIR}/PLIST.suexec -BUILD_DEFS+= APACHE_USER +BUILD_DEFS+= APACHE_USER APACHE_SUEXEC_DOCROOT .endif .if !defined(NOPIC) |