1 |
commit: 7adaac98b3ed54c43ce0b4a1dee5f6f6a4f9dab9 |
2 |
Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Mar 1 18:39:23 2023 +0000 |
4 |
Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Mar 1 18:39:40 2023 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7adaac98 |
7 |
|
8 |
www-servers/nginx-unit/files: Update conf.d and init.d files |
9 |
|
10 |
Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org> |
11 |
|
12 |
www-servers/nginx-unit/files/nginx-unit.confd | 1 - |
13 |
www-servers/nginx-unit/files/nginx-unit.initd-r1 | 15 ++++++++++++--- |
14 |
2 files changed, 12 insertions(+), 4 deletions(-) |
15 |
|
16 |
diff --git a/www-servers/nginx-unit/files/nginx-unit.confd b/www-servers/nginx-unit/files/nginx-unit.confd |
17 |
index eedf0ffbd685..b9ce82d332ce 100644 |
18 |
--- a/www-servers/nginx-unit/files/nginx-unit.confd |
19 |
+++ b/www-servers/nginx-unit/files/nginx-unit.confd |
20 |
@@ -18,7 +18,6 @@ |
21 |
# Modules directory name |
22 |
#NXT_MODULES="/usr/lib64/nginx-unit" |
23 |
|
24 |
- |
25 |
# State directory name |
26 |
#NXT_STATE="/var/lib/nginx-unit" |
27 |
|
28 |
|
29 |
diff --git a/www-servers/nginx-unit/files/nginx-unit.initd-r1 b/www-servers/nginx-unit/files/nginx-unit.initd-r1 |
30 |
index a9ad47834899..e4ea45cdbe35 100644 |
31 |
--- a/www-servers/nginx-unit/files/nginx-unit.initd-r1 |
32 |
+++ b/www-servers/nginx-unit/files/nginx-unit.initd-r1 |
33 |
@@ -4,13 +4,22 @@ |
34 |
|
35 |
command="/usr/sbin/unitd" |
36 |
pidfile="/run/nginx-unit.pid" |
37 |
-user=${NXT_USER:-nginx-unit} |
38 |
-group=${NXT_GROUP:-nginx-unit} |
39 |
+NXT_USER=${NXT_USER:-nginx-unit} |
40 |
+NXT_GROUP=${NXT_GROUP:-nginx-unit} |
41 |
+NXT_CONTROL=${NXT_CONTROL:-unix:/run/nginx-unit.sock} |
42 |
+NXT_PID=${NXT_PID:-/run/nginx-unit.pid} |
43 |
+NXT_LOG=${NXT_LOG:-/var/log/nginx-unit} |
44 |
+NXT_MODULES=${NXT_LOG:-/usr/lib64/nginx-unit} |
45 |
+NXT_STATE=${NXT_STATE:-/var/lib/nginx-unit} |
46 |
+NXT_TMP=${NXT_TMP:-/usr/tmp} |
47 |
+ |
48 |
+command_args=" --user ${NXT_USER} --group ${NXT_GROUP} --control ${NXT_CONTROL} --pid ${NXT_PID} --log ${NXT_LOG} --modules ${NXT_MODULES} --state ${NXT_STATE} --tmp ${NXT_TMP}" |
49 |
|
50 |
depend() { |
51 |
use dns logger netmount |
52 |
} |
53 |
|
54 |
start_pre() { |
55 |
- checkpath -d /var/lib/nginx-unit -o ${user}:${group} -m 0770 |
56 |
+ checkpath -d /var/lib/nginx-unit -o root:root -m 0770 |
57 |
} |
58 |
+ |