Browse Source

Merge pull request #14642 from 1715173329/xray

xray-core: fix service start / reload
lilik-openwrt-22.03
Rosen Penev 4 years ago
committed by GitHub
parent
commit
a3a96300af
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
  1. +12
    -3
      net/xray-core/files/xray.init

+ 12
- 3
net/xray-core/files/xray.init View File

@ -7,7 +7,7 @@ CONF="xray"
PROG="/usr/bin/xray" PROG="/usr/bin/xray"
CAPA_FILE="/etc/capabilities/xray.json" CAPA_FILE="/etc/capabilities/xray.json"
start_instance() {
start_service() {
config_load "$CONF" config_load "$CONF"
local enabled local enabled
@ -24,7 +24,7 @@ start_instance() {
config_get datadir "config" "datadir" "/usr/share/xray" config_get datadir "config" "datadir" "/usr/share/xray"
config_get format "config" "format" "json" config_get format "config" "format" "json"
procd_open_instance
procd_open_instance "$CONF"
procd_set_param command "$PROG" run procd_set_param command "$PROG" run
[ -n "$confdir" ] && procd_append_param command -confdir "$confdir" [ -n "$confdir" ] && procd_append_param command -confdir "$confdir"
[ -n "$conffiles" ] && { [ -n "$conffiles" ] && {
@ -42,10 +42,19 @@ start_instance() {
procd_set_param respawn procd_set_param respawn
[ -x "/sbin/ujail" -a -e "$CAPA_FILE" ] && { [ -x "/sbin/ujail" -a -e "$CAPA_FILE" ] && {
procd_add_jail xray
procd_add_jail "$CONF"
procd_set_param capabilities "$CAPA_FILE" procd_set_param capabilities "$CAPA_FILE"
procd_set_param user nobody procd_set_param user nobody
procd_set_param no_new_privs 1 procd_set_param no_new_privs 1
} }
procd_close_instance procd_close_instance
} }
reload_service() {
stop
start
}
service_triggers() {
procd_add_reload_trigger "$CONF"
}

Loading…
Cancel
Save