mirror of
https://github.com/kiddin9/op-packages.git
synced 2026-09-10 18:34:18 +08:00
158 lines
3.8 KiB
Diff
158 lines
3.8 KiB
Diff
--- a/frp/files/frpc.config
|
|
+++ b/frp/files/frpc.config
|
|
@@ -1,4 +1,5 @@
|
|
config init
|
|
+ option enabled '1'
|
|
option stdout '1'
|
|
option stderr '1'
|
|
# Uncomment to run frpc as an existing user/group. Keep disabled by
|
|
|
|
--- a/frp/files/frpc.init
|
|
+++ b/frp/files/frpc.init
|
|
@@ -912,6 +912,7 @@ service_triggers() {
|
|
|
|
start_service() {
|
|
local init_cfg=
|
|
+ local enabled=1
|
|
local stdout=1
|
|
local stderr=1
|
|
local respawn=1
|
|
@@ -919,14 +920,27 @@ start_service() {
|
|
local run_group=
|
|
local old_umask
|
|
|
|
- mkdir -p /var/etc
|
|
- _TOML_ERR=0
|
|
- _ALLOW_UNSAFE_TOKEN_SOURCE_EXEC=0
|
|
-
|
|
config_load "$NAME"
|
|
|
|
config_foreach _find_init_section init
|
|
|
|
+ if [ -n "$init_cfg" ]; then
|
|
+ config_list_foreach "$init_cfg" conf_inc _append_conf_file
|
|
+
|
|
+ config_get_bool enabled "$init_cfg" enabled 1
|
|
+ config_get_bool stdout "$init_cfg" stdout 1
|
|
+ config_get_bool stderr "$init_cfg" stderr 1
|
|
+ config_get_bool respawn "$init_cfg" respawn 1
|
|
+ config_get run_user "$init_cfg" user
|
|
+ config_get run_group "$init_cfg" group
|
|
+ fi
|
|
+
|
|
+ [ "$enabled" -eq 0 ] && return 1
|
|
+
|
|
+ mkdir -p /var/etc
|
|
+ _TOML_ERR=0
|
|
+ _ALLOW_UNSAFE_TOKEN_SOURCE_EXEC=0
|
|
+
|
|
old_umask="$(umask)"
|
|
umask 077
|
|
: > "$CONF_FILE" || {
|
|
@@ -948,16 +962,6 @@ start_service() {
|
|
} >> "$CONF_FILE" || return 1
|
|
[ "$_TOML_ERR" = "0" ] || return 1
|
|
|
|
- if [ -n "$init_cfg" ]; then
|
|
- config_list_foreach "$init_cfg" conf_inc _append_conf_file
|
|
-
|
|
- config_get_bool stdout "$init_cfg" stdout 1
|
|
- config_get_bool stderr "$init_cfg" stderr 1
|
|
- config_get_bool respawn "$init_cfg" respawn 1
|
|
- config_get run_user "$init_cfg" user
|
|
- config_get run_group "$init_cfg" group
|
|
- fi
|
|
-
|
|
{
|
|
config_foreach _emit_conf_section conf
|
|
} >> "$CONF_FILE" || return 1
|
|
|
|
--- a/frp/files/frpc.uci-defaults
|
|
+++ b/frp/files/frpc.uci-defaults
|
|
@@ -79,6 +79,7 @@ upgrade_init() {
|
|
changed=1
|
|
fi
|
|
|
|
+ set_if_empty "$init_section" enabled 1
|
|
set_if_empty "$init_section" stdout 1
|
|
set_if_empty "$init_section" stderr 1
|
|
set_if_empty "$init_section" respawn 1
|
|
|
|
--- a/frp/files/frps.config
|
|
+++ b/frp/files/frps.config
|
|
@@ -1,4 +1,5 @@
|
|
config init
|
|
+ option enabled '1'
|
|
option stdout '1'
|
|
option stderr '1'
|
|
# Uncomment to run frps as an existing user/group. Keep disabled by
|
|
|
|
--- a/frp/files/frps.init
|
|
+++ b/frp/files/frps.init
|
|
@@ -689,6 +689,7 @@ service_triggers() {
|
|
|
|
start_service() {
|
|
local init_cfg=
|
|
+ local enabled=1
|
|
local stdout=1
|
|
local stderr=1
|
|
local respawn=1
|
|
@@ -696,13 +697,28 @@ start_service() {
|
|
local run_group=
|
|
local old_umask
|
|
|
|
+ config_load "$NAME"
|
|
+
|
|
+ config_foreach _find_init_section init
|
|
+
|
|
+ if [ -n "$init_cfg" ]; then
|
|
+ config_list_foreach "$init_cfg" conf_inc _append_conf_file
|
|
+
|
|
+ config_get_bool enabled "$init_cfg" enabled 1
|
|
+ config_get_bool stdout "$init_cfg" stdout 1
|
|
+ config_get_bool stderr "$init_cfg" stderr 1
|
|
+ config_get_bool respawn "$init_cfg" respawn 1
|
|
+ config_get run_user "$init_cfg" user
|
|
+ config_get run_group "$init_cfg" group
|
|
+ fi
|
|
+
|
|
+ [ "$enabled" -eq 0 ] && return 1
|
|
+
|
|
mkdir -p /var/etc
|
|
_TOML_ERR=0
|
|
_ALLOW_UNSAFE_TOKEN_SOURCE_EXEC=0
|
|
|
|
- config_load "$NAME"
|
|
|
|
- config_foreach _find_init_section init
|
|
|
|
old_umask="$(umask)"
|
|
umask 077
|
|
@@ -725,15 +741,7 @@ start_service() {
|
|
} >> "$CONF_FILE" || return 1
|
|
[ "$_TOML_ERR" = "0" ] || return 1
|
|
|
|
- if [ -n "$init_cfg" ]; then
|
|
- config_list_foreach "$init_cfg" conf_inc _append_conf_file
|
|
|
|
- config_get_bool stdout "$init_cfg" stdout 1
|
|
- config_get_bool stderr "$init_cfg" stderr 1
|
|
- config_get_bool respawn "$init_cfg" respawn 1
|
|
- config_get run_user "$init_cfg" user
|
|
- config_get run_group "$init_cfg" group
|
|
- fi
|
|
|
|
{
|
|
config_foreach _emit_http_plugin http_plugin
|
|
|
|
--- a/frp/files/frps.uci-defaults
|
|
+++ b/frp/files/frps.uci-defaults
|
|
@@ -90,6 +90,7 @@ upgrade_init() {
|
|
changed=1
|
|
fi
|
|
|
|
+ set_if_empty "$init_section" enabled 1
|
|
set_if_empty "$init_section" stdout 1
|
|
set_if_empty "$init_section" stderr 1
|
|
set_if_empty "$init_section" respawn 1
|