1 |
commit: af547811efa07620534f0c5b5d1db5fc75ebcf39 |
2 |
Author: Yixun Lan <dlan <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Sep 27 13:43:35 2020 +0000 |
4 |
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 27 13:47:34 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af547811 |
7 |
|
8 |
net-proxy/trojan: fix permission with log file |
9 |
|
10 |
Package-Manager: Portage-3.0.0, Repoman-2.3.23 |
11 |
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org> |
12 |
|
13 |
net-proxy/trojan/files/trojan.initd | 16 ++++++++++------ |
14 |
1 file changed, 10 insertions(+), 6 deletions(-) |
15 |
|
16 |
diff --git a/net-proxy/trojan/files/trojan.initd b/net-proxy/trojan/files/trojan.initd |
17 |
index c87f6576d6b..348d307c526 100644 |
18 |
--- a/net-proxy/trojan/files/trojan.initd |
19 |
+++ b/net-proxy/trojan/files/trojan.initd |
20 |
@@ -2,6 +2,9 @@ |
21 |
# Copyright 1999-2020 Gentoo Authors |
22 |
# Distributed under the terms of the GNU General Public License v2 |
23 |
|
24 |
+TJ_USER=nobody |
25 |
+TJ_GROUP=nobody |
26 |
+ |
27 |
TJ_NAME=${SVCNAME##*.} |
28 |
if [ -n "${TJ_NAME}" -a "${SVCNAME}" != "trojan" ]; then |
29 |
TJ_PIDFILE="/run/trojan.${TJ_NAME}.pid" |
30 |
@@ -19,10 +22,11 @@ depend() { |
31 |
|
32 |
start() { |
33 |
ebegin "Starting Trojan, Log File: ${TJ_LOG}" |
34 |
- start-stop-daemon --start -b \ |
35 |
- --user nobody --group nobody \ |
36 |
- -1 "${TJ_LOG}" -2 "${TJ_LOG}" \ |
37 |
- -m -p "${TJ_PIDFILE}" \ |
38 |
+ checkpath -f -m 0600 -o ${TJ_USER}:${TJ_GROUP} "${TJ_LOG}" |
39 |
+ start-stop-daemon --start --background \ |
40 |
+ --user ${TJ_USER} --group ${TJ_GROUP} \ |
41 |
+ --stdout "${TJ_LOG}" --stderr "${TJ_LOG}" \ |
42 |
+ --make-pidfile --pidfile "${TJ_PIDFILE}" \ |
43 |
--exec /usr/bin/trojan -- "${TJ_CONFIG}" |
44 |
eend $? |
45 |
} |
46 |
@@ -30,7 +34,7 @@ start() { |
47 |
stop() { |
48 |
ebegin "Stopping Trojan" |
49 |
start-stop-daemon --stop \ |
50 |
- --user nobody --group nobody \ |
51 |
- -p "${TJ_PIDFILE}" |
52 |
+ --user ${TJ_USER} --group ${TJ_GROUP} \ |
53 |
+ --pidfile "${TJ_PIDFILE}" |
54 |
eend $? |
55 |
} |