From 39425d87976440a0a0ed4424e603b34b21e29cfd Mon Sep 17 00:00:00 2001 From: actions-user Date: Wed, 13 Nov 2024 02:09:04 +0800 Subject: [PATCH] update 2024-11-13 02:09:04 --- alist/files/alist.init | 25 ++++++----------------- luci-app-store/Makefile | 2 +- luci-app-store/luasrc/view/store/main.htm | 2 +- luci-app-store/root/bin/is-opkg | 4 ++-- luci-app-store/src/compat.conf | 2 +- 5 files changed, 11 insertions(+), 24 deletions(-) diff --git a/alist/files/alist.init b/alist/files/alist.init index dc98bc7f..3a12323f 100755 --- a/alist/files/alist.init +++ b/alist/files/alist.init @@ -5,7 +5,6 @@ START=99 USE_PROCD=1 PROG=/usr/bin/alist -LOG_FILE=/var/log/alist.log get_config() { config_get_bool enabled $1 enabled 1 @@ -25,6 +24,7 @@ get_config() { # log config_get log $1 log 1 + config_get log_path $1 log_path '/var/log/alist.log' config_get log_max_size $1 log_max_size 10 config_get log_max_backups $1 log_max_backups 5 config_get log_max_age $1 log_max_age 28 @@ -67,14 +67,6 @@ get_config() { config_get s3_port $1 s3_port 5246 config_get s3_ssl $1 s3_ssl 0 - config_load network - config_get lan_addr lan ipaddr "0.0.0.0" - if echo "${lan_addr}" | grep -Fq ' '; then - lan_addr="0.0.0.0" - else - lan_addr=${lan_addr%%/*} - fi - # init jwt_secret [ -z "$jwt_secret" ] && jwt_secret=$(tr -cd "a-zA-Z0-9" < "/dev/urandom" | head -c16) uci -q set alist.@alist[0].jwt_secret="$jwt_secret" @@ -111,16 +103,11 @@ start_service() { else delayed_start=$delayed_start fi - if [ "$allow_wan" -eq "1" ]; then - listen_addr="0.0.0.0" - external_access="allow" - else - listen_addr=$lan_addr - external_access="deny" - fi + + [ "$allow_wan" -eq "1" ] && external_access="allow" || external_access="deny" set_firewall - > $LOG_FILE + > "$log_path" # init config json_init @@ -153,7 +140,7 @@ start_service() { # scheme json_add_object "scheme" - json_add_string "address" "$listen_addr" + json_add_string "address" "0.0.0.0" json_add_int "http_port" "$http_port" json_add_int "https_port" "$https_port" json_add_boolean "force_https" "$force_https" @@ -170,7 +157,7 @@ start_service() { # log json_add_object "log" json_add_boolean "enable" "$log" - json_add_string "name" "$LOG_FILE" + json_add_string "name" "$log_path" json_add_int "max_size" "$log_max_size" json_add_int "max_backups" "$log_max_backups" json_add_int "max_age" "$log_max_age" diff --git a/luci-app-store/Makefile b/luci-app-store/Makefile index 7dd22fef..2c43aa97 100644 --- a/luci-app-store/Makefile +++ b/luci-app-store/Makefile @@ -11,7 +11,7 @@ LUCI_DEPENDS:=+curl +opkg +luci-base +tar +libuci-lua +mount-utils +luci-lib-tas LUCI_EXTRA_DEPENDS:=luci-lib-taskd (>=1.0.19) LUCI_PKGARCH:=all -PKG_VERSION:=0.1.26-0 +PKG_VERSION:=0.1.26-2 # PKG_RELEASE MUST be empty for luci.mk PKG_RELEASE:= diff --git a/luci-app-store/luasrc/view/store/main.htm b/luci-app-store/luasrc/view/store/main.htm index 0abe09ec..091d5f07 100644 --- a/luci-app-store/luasrc/view/store/main.htm +++ b/luci-app-store/luasrc/view/store/main.htm @@ -14,7 +14,7 @@ } }); window.vue_base = vue_prefix + '/'; - // window.istore_api_base = "https://istore.linkease.com"; + // window.istore_api_base = "https://istore.istoreos.com"; window.vue_lang_data = '/luci-static/istore/i18n/<%=lang%>.json?v=<%=id.version%>'; window.vue_lang = '<%=lang%>'; window.token = "<%=token%>"; diff --git a/luci-app-store/root/bin/is-opkg b/luci-app-store/root/bin/is-opkg index 20a91df2..ab5470a8 100755 --- a/luci-app-store/root/bin/is-opkg +++ b/luci-app-store/root/bin/is-opkg @@ -15,7 +15,7 @@ LISTS_DIR_O=/tmp/opkg-lists LISTS_DIR=${IS_ROOT}${LISTS_DIR_O} OPKG_CONF_DIR=${IS_ROOT}/etc/opkg OPKG_CONF_DIR_M=${IS_ROOT}/etc/opkg_m -FEEDS_SERVER=https://istore.linkease.com/repo +FEEDS_SERVER=https://istore.istoreos.com/repo FEEDS_SERVER_MIRRORS="https://repo.istoreos.com/repo" DISABLE_MIRROR=false ARCH=`sed -n -e 's/^Architecture: *\([^ ]\+\) *$/\1/p' /rom/usr/lib/opkg/info/libc.control /usr/lib/opkg/info/libc.control 2>/dev/null | head -1` @@ -23,7 +23,7 @@ ARCH=`sed -n -e 's/^Architecture: *\([^ ]\+\) *$/\1/p' /rom/usr/lib/opkg/info/li # for istore self upgrade ISTORE_PKG=luci-app-store ISTORE_DEP_PKGS="luci-lib-taskd luci-lib-xterm taskd" -ISTORE_INDEX=https://istore.linkease.com/repo/all/store/Packages.gz +ISTORE_INDEX=https://istore.istoreos.com/repo/all/store/Packages.gz is_init() { mkdir -p ${DL_DIR} ${LISTS_DIR} ${IS_ROOT}/etc ${IS_ROOT}/var diff --git a/luci-app-store/src/compat.conf b/luci-app-store/src/compat.conf index 158938e9..59393abb 100644 --- a/luci-app-store/src/compat.conf +++ b/luci-app-store/src/compat.conf @@ -1 +1 @@ -src/gz istore_compat https://istore.linkease.com/repo/all/compat \ No newline at end of file +src/gz istore_compat https://istore.istoreos.com/repo/all/compat \ No newline at end of file