diff options
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.defaults.mk | 10 | ||||
| -rw-r--r-- | mk/bsd.pkg.obsolete.mk | 6 |
2 files changed, 13 insertions, 3 deletions
diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk index b91f798d7e4..fe0d1f3814c 100644 --- a/mk/bsd.pkg.defaults.mk +++ b/mk/bsd.pkg.defaults.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.defaults.mk,v 1.28 2001/12/21 03:59:15 fredb Exp $ +# $NetBSD: bsd.pkg.defaults.mk,v 1.29 2001/12/26 21:20:26 jlam Exp $ # # A file providing defaults for pkgsrc and the packages collection. @@ -386,12 +386,18 @@ APACHE_SUEXEC_DOCROOT?= ${LOCALBASE}/share/httpd/htdocs # Possible: Any valid directory # Default: ${LOCALBASE}/share/httpd/htdocs -APACHE_USER?= www +APACHE_SUEXEC_USER?= www # Used in the apache package to specify the user allowed to execute # the `suexec' wrapper. # Possible: any user name # Default: www +#APACHE_SUEXEC_CONFIGURE_ARGS= --suexec-uidmin=1000 +# Used in the apache package to specify additional suexec options to be +# passed to the Apache configure script. +# Possible: any --suexec-* options recognized by the Apache configure script. +# Default: not defined + ARLA_CACHE?= ${LOCALBASE}/cache # Specifies the location of the cache used by arla. Should be on a local disk. # Default: ${LOCALBASE}/cache diff --git a/mk/bsd.pkg.obsolete.mk b/mk/bsd.pkg.obsolete.mk index 6fd8d71fc16..c9804eede51 100644 --- a/mk/bsd.pkg.obsolete.mk +++ b/mk/bsd.pkg.obsolete.mk @@ -1,9 +1,13 @@ -# $NetBSD: bsd.pkg.obsolete.mk,v 1.5 2001/12/18 20:22:59 jlam Exp $ +# $NetBSD: bsd.pkg.obsolete.mk,v 1.6 2001/12/26 21:20:26 jlam Exp $ # # This file holds make(1) logic to allow obsolete or deprecated variables # still to be used. These may eventually disappear over time as the contents # are, by definition, obsolete and deprecated. +.if defined(APACHE_USER) +APACHE_SUEXEC_USER?= ${APACHE_USER} +.endif + .if defined(APACHE_SYSCONFDIR) PKG_SYSCONFDIR.ap-ssl?= ${APACHE_SYSCONFDIR} PKG_SYSCONFDIR.apache?= ${APACHE_SYSCONFDIR} |