gandalf/secubox-openwrt
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/v0.15.0'

Browse Source
This commit is contained in:
CyberMind-FR 2026-01-26 12:38:02 +01:00
commit 750dccd644
1 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
package/secubox/secubox-app-streamlit/files/usr/sbin/streamlitctl
View File

@ -268,23 +268,25 @@ STARTUP
} }
# Build instances string from UCI config # Build instances string from UCI config
build_instances_string() { _instances_result=""
local instances="" _build_instance_entry() {
local _add_instance() { local section="$1"
local section="$1" local inst_enabled inst_app inst_port
local inst_enabled inst_app inst_port config_get inst_enabled "$section" enabled "0"
config_get inst_enabled "$section" enabled "0" config_get inst_app "$section" app ""
config_get inst_app "$section" app "" config_get inst_port "$section" port ""
config_get inst_port "$section" port ""
if [ "$inst_enabled" = "1" ] && [ -n "$inst_app" ] && [ -n "$inst_port" ]; then if [ "$inst_enabled" = "1" ] && [ -n "$inst_app" ] && [ -n "$inst_port" ]; then
[ -n "$instances" ] && instances="${instances}," [ -n "$_instances_result" ] && _instances_result="${_instances_result},"
instances="${instances}${inst_app}:${inst_port}" _instances_result="${_instances_result}${inst_app}:${inst_port}"
fi fi
} }
build_instances_string() {
_instances_result=""
config_load "$CONFIG" config_load "$CONFIG"
config_foreach _add_instance instance config_foreach _build_instance_entry instance
echo "$instances" echo "$_instances_result"
} }
# Create LXC config # Create LXC config
@ -740,27 +742,29 @@ cmd_service_stop() {
} }
# Instance management # Instance management
_instance_list_first=1
_print_instance_json() {
local section="$1"
local name app port enabled
config_get name "$section" name "$section"
config_get app "$section" app ""
config_get port "$section" port ""
config_get enabled "$section" enabled "0"
[ "$_instance_list_first" -eq 0 ] && echo ","
_instance_list_first=0
printf ' {"id": "%s", "name": "%s", "app": "%s", "port": "%s", "enabled": %s}' \
"$section" "$name" "$app" "$port" "$([ "$enabled" = "1" ] && echo "true" || echo "false")"
}
cmd_instance_list() { cmd_instance_list() {
load_config load_config
echo "{" echo "{"
echo ' "instances": [' echo ' "instances": ['
local first=1 _instance_list_first=1
_list_instance() {
local section="$1"
local name app port enabled
config_get name "$section" name "$section"
config_get app "$section" app ""
config_get port "$section" port ""
config_get enabled "$section" enabled "0"
[ $first -eq 0 ] && echo ","
first=0
printf ' {"id": "%s", "name": "%s", "app": "%s", "port": "%s", "enabled": %s}' \
"$section" "$name" "$app" "$port" "$([ "$enabled" = "1" ] && echo "true" || echo "false")"
}
config_load "$CONFIG" config_load "$CONFIG"
config_foreach _list_instance instance config_foreach _print_instance_json instance
echo "" echo ""
echo " ]" echo " ]"
echo "}" echo "}"