From 7adaac98b3ed54c43ce0b4a1dee5f6f6a4f9dab9 Mon Sep 17 00:00:00 2001 From: Mike Pagano Date: Wed, 1 Mar 2023 13:39:23 -0500 Subject: www-servers/nginx-unit/files: Update conf.d and init.d files Signed-off-by: Mike Pagano --- www-servers/nginx-unit/files/nginx-unit.confd | 1 - www-servers/nginx-unit/files/nginx-unit.initd-r1 | 15 ++++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/www-servers/nginx-unit/files/nginx-unit.confd b/www-servers/nginx-unit/files/nginx-unit.confd index eedf0ffbd685..b9ce82d332ce 100644 --- a/www-servers/nginx-unit/files/nginx-unit.confd +++ b/www-servers/nginx-unit/files/nginx-unit.confd @@ -18,7 +18,6 @@ # Modules directory name #NXT_MODULES="/usr/lib64/nginx-unit" - # State directory name #NXT_STATE="/var/lib/nginx-unit" diff --git a/www-servers/nginx-unit/files/nginx-unit.initd-r1 b/www-servers/nginx-unit/files/nginx-unit.initd-r1 index a9ad47834899..e4ea45cdbe35 100644 --- a/www-servers/nginx-unit/files/nginx-unit.initd-r1 +++ b/www-servers/nginx-unit/files/nginx-unit.initd-r1 @@ -4,13 +4,22 @@ command="/usr/sbin/unitd" pidfile="/run/nginx-unit.pid" -user=${NXT_USER:-nginx-unit} -group=${NXT_GROUP:-nginx-unit} +NXT_USER=${NXT_USER:-nginx-unit} +NXT_GROUP=${NXT_GROUP:-nginx-unit} +NXT_CONTROL=${NXT_CONTROL:-unix:/run/nginx-unit.sock} +NXT_PID=${NXT_PID:-/run/nginx-unit.pid} +NXT_LOG=${NXT_LOG:-/var/log/nginx-unit} +NXT_MODULES=${NXT_LOG:-/usr/lib64/nginx-unit} +NXT_STATE=${NXT_STATE:-/var/lib/nginx-unit} +NXT_TMP=${NXT_TMP:-/usr/tmp} + +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}" depend() { use dns logger netmount } start_pre() { - checkpath -d /var/lib/nginx-unit -o ${user}:${group} -m 0770 + checkpath -d /var/lib/nginx-unit -o root:root -m 0770 } + -- cgit v1.2.3-65-gdbad