summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorschmonz <schmonz>2017-04-27 20:35:10 +0000
committerschmonz <schmonz>2017-04-27 20:35:10 +0000
commit3c9c9ae92d8979d7300776deb9a7da97e3713585 (patch)
treedecf77c53e97ef9f777039094c50ccad4aac891c /mail
parent41a515798b13ba4a9e588fb176ec3da4a1698968 (diff)
downloadpkgsrc-3c9c9ae92d8979d7300776deb9a7da97e3713585.tar.gz
Honor custom values of ${QMAIL_DAEMON_USER} and ${QMAIL_QMAIL_GROUP}.
Diffstat (limited to 'mail')
-rw-r--r--mail/qmail/INSTALL6
-rw-r--r--mail/qmail/Makefile4
2 files changed, 7 insertions, 3 deletions
diff --git a/mail/qmail/INSTALL b/mail/qmail/INSTALL
index 83c3a78f0a6..176555ecb06 100644
--- a/mail/qmail/INSTALL
+++ b/mail/qmail/INSTALL
@@ -1,10 +1,12 @@
-# $NetBSD: INSTALL,v 1.7 2017/03/20 16:23:19 schmonz Exp $
+# $NetBSD: INSTALL,v 1.8 2017/04/27 20:35:10 schmonz Exp $
DOCDIR=@DOCDIR@
EGDIR=@EGDIR@
OPENSSL=@OPENSSL@
PKGMANDIR=@PKGMANDIR@
QMAILDIR=@QMAILDIR@
+QMAIL_DAEMON_USER=@QMAIL_DAEMON_USER@
+QMAIL_QMAIL_GROUP=@QMAIL_QMAIL_GROUP@
QMAIL_QUEUE_DIR=@QMAIL_QUEUE_DIR@
QMAIL_QUEUE_EXTRA=@QMAIL_QUEUE_EXTRA@
@@ -78,7 +80,7 @@ NOTE: If you don't already have an SSL certificate for qmail:
# ${OPENSSL} req -new -x509 -nodes -days 366 -out ${SERVERCERT} -keyout ${SERVERCERT}
# chmod 640 ${SERVERCERT}
-# chown qmaild:qmail ${SERVERCERT}
+# chown ${QMAIL_DAEMON_USER}:${QMAIL_QMAIL_GROUP} ${SERVERCERT}
# ln -s ${SERVERCERT} ${PKG_SYSCONFDIR}/control/clientcert.pem
# update_tmprsadh
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index cdb3c3e2cf8..dd05013e052 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2017/04/08 18:22:51 schmonz Exp $
+# $NetBSD: Makefile,v 1.85 2017/04/27 20:35:10 schmonz Exp $
#
DISTNAME= ${PKGNAME_NOREV}
@@ -57,6 +57,8 @@ FILES_SUBST+= DOCDIR=${DOCDIR:Q} EGDIR=${EGDIR:Q}
FILES_SUBST+= OPENSSL=${OPENSSL:Q}
FILES_SUBST+= PKGMANDIR=${PKGMANDIR:Q} SHAREDIR=${SHAREDIR:Q}
FILES_SUBST+= QMAILDIR=${QMAILDIR:Q}
+FILES_SUBST+= QMAIL_DAEMON_USER=${QMAIL_DAEMON_USER:Q}
+FILES_SUBST+= QMAIL_QMAIL_GROUP=${QMAIL_QMAIL_GROUP:Q}
FILES_SUBST+= QMAIL_QUEUE_DIR=${QMAIL_QUEUE_DIR:Q}
FILES_SUBST+= QMAIL_QUEUE_EXTRA=${QMAIL_QUEUE_EXTRA:Q}
FILES_SUBST+= PKGNAME=${PKGNAME:Q}