pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Add a "www" user, and make the GRAPHITE_DIR owned by that user by default. This makes it easier to work with apache by default.
Module Name: pkgsrc-wip
Committed By: Jeff Rizzo <riz%tastylime.net@localhost>
Pushed By: riz
Date: Mon Dec 7 15:21:26 2015 -0800
Changeset: ca9a2d3d0dbd6aedaf592ce6cc8d581da3b6f80c
Modified Files:
py-carbon/Makefile
py-carbon/Makefile.common
Log Message:
Add a "www" user, and make the GRAPHITE_DIR owned
by that user by default. This makes it easier to
work with apache by default.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ca9a2d3d0dbd6aedaf592ce6cc8d581da3b6f80c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
py-carbon/Makefile | 2 +-
py-carbon/Makefile.common | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diffs:
diff --git a/py-carbon/Makefile b/py-carbon/Makefile
index 9f1846a..33d3949 100644
--- a/py-carbon/Makefile
+++ b/py-carbon/Makefile
@@ -26,7 +26,7 @@ RCD_SCRIPTS= carbon-aggregator carbon-cache carbon-relay
FILES_SUBST+= GRAPHITE_USER=${GRAPHITE_USER} GRAPHITE_GROUP=${GRAPHITE_GROUP} \
GRAPHITE_DIR=${GRAPHITE_DIR}
-OWN_DIRS_PERMS+= ${GRAPHITE_DIR} ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755
+OWN_DIRS_PERMS+= ${GRAPHITE_DIR} ${WWW_USER} ${GRAPHITE_GROUP} 0775
OWN_DIRS_PERMS+= ${GRAPHITE_DIR}/lists ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755
OWN_DIRS_PERMS+= ${GRAPHITE_DIR}/rrd ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755
OWN_DIRS_PERMS+= ${GRAPHITE_DIR}/whisper ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755
diff --git a/py-carbon/Makefile.common b/py-carbon/Makefile.common
index 081da19..abdc47b 100644
--- a/py-carbon/Makefile.common
+++ b/py-carbon/Makefile.common
@@ -2,10 +2,12 @@
GRAPHITE_USER?= graphite
GRAPHITE_GROUP?= graphite
+WWW_USER?= www
+WWW_GROUP?= www
GRAPHITE_DIR?= ${VARBASE}/graphite
GRAPHITE_EGDIR?= share/examples/graphite
GRAPHITE_LOG_DIR?= ${VARBASE}/log/graphite
-PKG_GROUPS+= ${GRAPHITE_GROUP}
-PKG_USERS+= ${GRAPHITE_USER}:${GRAPHITE_GROUP}
+PKG_GROUPS+= ${GRAPHITE_GROUP} ${WWW_GROUP}
+PKG_USERS+= ${GRAPHITE_USER}:${GRAPHITE_GROUP} ${WWW_USER}:${WWW_GROUP}
PKG_GECOS.${GRAPHITE_USER}= Graphite Carbon user
Home |
Main Index |
Thread Index |
Old Index