mirror of
https://github.com/openwrt/packages.git
synced 2025-12-21 23:34:31 +04:00
znc: Added RUNAS_SHELL variable to assist when using external configuration
Signed-off-by: Graham Fairweather <xotic750@gmail.com>
This commit is contained in:
@@ -12,6 +12,7 @@ DISABLED=
|
|||||||
|
|
||||||
RUNAS_USER=
|
RUNAS_USER=
|
||||||
RUNAS_GROUP=
|
RUNAS_GROUP=
|
||||||
|
RUNAS_SHELL=
|
||||||
|
|
||||||
add_param() {
|
add_param() {
|
||||||
echo "$1 = $2" >> $ZNC_CONFIG
|
echo "$1 = $2" >> $ZNC_CONFIG
|
||||||
@@ -60,6 +61,7 @@ znc_global() {
|
|||||||
|
|
||||||
config_get RUNAS_USER "$znc" runas_user
|
config_get RUNAS_USER "$znc" runas_user
|
||||||
config_get RUNAS_GROUP "$znc" runas_group
|
config_get RUNAS_GROUP "$znc" runas_group
|
||||||
|
config_get RUNAS_SHELL "$znc" runas_shell
|
||||||
|
|
||||||
if [ "${znc_config_path}" ]
|
if [ "${znc_config_path}" ]
|
||||||
then
|
then
|
||||||
@@ -168,7 +170,7 @@ start() {
|
|||||||
config_foreach add_listener listener
|
config_foreach add_listener listener
|
||||||
config_foreach add_user user
|
config_foreach add_user user
|
||||||
|
|
||||||
chown -hR ${RUNAS_USER:-nobody}:${RUNAS_GROUP:-nogroup} /tmp/etc/znc
|
chown -hR ${RUNAS_USER:-nobody}:${RUNAS_GROUP:-nogroup} ${ZNC_CONFIG_PATH}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$EXTERNAL_CONFIG" -eq 1 -a "$RUNAS_USER" ]
|
if [ "$EXTERNAL_CONFIG" -eq 1 -a "$RUNAS_USER" ]
|
||||||
@@ -176,7 +178,8 @@ start() {
|
|||||||
local SU=$(which su)
|
local SU=$(which su)
|
||||||
if [ "$SU" ]
|
if [ "$SU" ]
|
||||||
then
|
then
|
||||||
$SU -c "/usr/bin/znc -d$ZNC_CONFIG_PATH >/dev/null &" $RUNAS_USER
|
chown -hR ${RUNAS_USER:-nobody}:${RUNAS_GROUP:-nogroup} ${ZNC_CONFIG_PATH}
|
||||||
|
$SU ${RUNAS_SHELL:+s $RUNAS_SHELL} -c "/usr/bin/znc -d$ZNC_CONFIG_PATH >/dev/null &" $RUNAS_USER
|
||||||
else
|
else
|
||||||
logger -s -t ZNC -p daemon.err "Could not run ZNC as user $RUNAS_USER: su not found."
|
logger -s -t ZNC -p daemon.err "Could not run ZNC as user $RUNAS_USER: su not found."
|
||||||
exit 1
|
exit 1
|
||||||
|
|||||||
Reference in New Issue
Block a user