summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2016-12-26 18:48:29 +0000
committerMark Felder <feld@FreeBSD.org>2016-12-26 18:48:29 +0000
commit402fe64cc9ffbb743a1478297c78e13984d2dea7 (patch)
treef2c2489b126750124cb019449786ae2a11e68e81
parent- Add TEST_TARGET (diff)
net-p2p/couchpotato: Provision ETCDIR in rc script, not in package.
CouchPotato creates the config file on first run. If you choose to run with a custom user you will want the rc script to provision the ETCDIR with the correct ownership.
Notes
Notes: svn path=/head/; revision=429565
-rw-r--r--net-p2p/couchpotato/Makefile3
-rw-r--r--net-p2p/couchpotato/files/couchpotato.in3
-rw-r--r--net-p2p/couchpotato/pkg-plist1
3 files changed, 5 insertions, 2 deletions
diff --git a/net-p2p/couchpotato/Makefile b/net-p2p/couchpotato/Makefile
index 0abbcca96c63..a108abef46cf 100644
--- a/net-p2p/couchpotato/Makefile
+++ b/net-p2p/couchpotato/Makefile
@@ -3,6 +3,7 @@
PORTNAME= couchpotato
PORTVERSION= 0.0.20161225
+PORTREVISION= 1
CATEGORIES= net-p2p python
MAINTAINER= feld@FreeBSD.org
@@ -29,7 +30,7 @@ GH_PROJECT= CouchPotatoServer
GH_TAGNAME= b538f9a
do-install:
- ${MKDIR} ${STAGEDIR}/${DATADIR} ${STAGEDIR}/${ETCDIR}
+ ${MKDIR} ${STAGEDIR}/${DATADIR}
(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
.include <bsd.port.mk>
diff --git a/net-p2p/couchpotato/files/couchpotato.in b/net-p2p/couchpotato/files/couchpotato.in
index bd08298863ac..0193b824c2b4 100644
--- a/net-p2p/couchpotato/files/couchpotato.in
+++ b/net-p2p/couchpotato/files/couchpotato.in
@@ -42,6 +42,9 @@ couch_pre()
if [ ! -d ${pidfile%/*} ]; then
install -d -o ${couchpotato_user} ${pidfile%/*}
fi
+ if [ ! -d ${couchpotato_conf%/*} ]; then
+ install -d -o ${couchpotato_user} ${couchpotato_conf%/*}
+ fi
}
run_rc_command "$1"
diff --git a/net-p2p/couchpotato/pkg-plist b/net-p2p/couchpotato/pkg-plist
index 9472063c0115..e91dc182260d 100644
--- a/net-p2p/couchpotato/pkg-plist
+++ b/net-p2p/couchpotato/pkg-plist
@@ -1005,4 +1005,3 @@
%%DATADIR%%/package.json
%%DATADIR%%/requirements-dev.txt
%%DATADIR%%/version.py
-@dir(nobody,wheel,755) %%ETCDIR%%