update 2024-11-13 02:09:04

This commit is contained in:
actions-user 2024-11-13 02:09:04 +08:00
parent 26ace370f9
commit 39425d8797
5 changed files with 11 additions and 24 deletions

View File

@ -5,7 +5,6 @@
START=99 START=99
USE_PROCD=1 USE_PROCD=1
PROG=/usr/bin/alist PROG=/usr/bin/alist
LOG_FILE=/var/log/alist.log
get_config() { get_config() {
config_get_bool enabled $1 enabled 1 config_get_bool enabled $1 enabled 1
@ -25,6 +24,7 @@ get_config() {
# log # log
config_get log $1 log 1 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_size $1 log_max_size 10
config_get log_max_backups $1 log_max_backups 5 config_get log_max_backups $1 log_max_backups 5
config_get log_max_age $1 log_max_age 28 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_port $1 s3_port 5246
config_get s3_ssl $1 s3_ssl 0 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 # init jwt_secret
[ -z "$jwt_secret" ] && jwt_secret=$(tr -cd "a-zA-Z0-9" < "/dev/urandom" | head -c16) [ -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" uci -q set alist.@alist[0].jwt_secret="$jwt_secret"
@ -111,16 +103,11 @@ start_service() {
else else
delayed_start=$delayed_start delayed_start=$delayed_start
fi fi
if [ "$allow_wan" -eq "1" ]; then
listen_addr="0.0.0.0" [ "$allow_wan" -eq "1" ] && external_access="allow" || external_access="deny"
external_access="allow"
else
listen_addr=$lan_addr
external_access="deny"
fi
set_firewall set_firewall
> $LOG_FILE > "$log_path"
# init config # init config
json_init json_init
@ -153,7 +140,7 @@ start_service() {
# scheme # scheme
json_add_object "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 "http_port" "$http_port"
json_add_int "https_port" "$https_port" json_add_int "https_port" "$https_port"
json_add_boolean "force_https" "$force_https" json_add_boolean "force_https" "$force_https"
@ -170,7 +157,7 @@ start_service() {
# log # log
json_add_object "log" json_add_object "log"
json_add_boolean "enable" "$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_size" "$log_max_size"
json_add_int "max_backups" "$log_max_backups" json_add_int "max_backups" "$log_max_backups"
json_add_int "max_age" "$log_max_age" json_add_int "max_age" "$log_max_age"

View File

@ -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_EXTRA_DEPENDS:=luci-lib-taskd (>=1.0.19)
LUCI_PKGARCH:=all 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 MUST be empty for luci.mk
PKG_RELEASE:= PKG_RELEASE:=

View File

@ -14,7 +14,7 @@
} }
}); });
window.vue_base = vue_prefix + '/'; 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_data = '/luci-static/istore/i18n/<%=lang%>.json?v=<%=id.version%>';
window.vue_lang = '<%=lang%>'; window.vue_lang = '<%=lang%>';
window.token = "<%=token%>"; window.token = "<%=token%>";

View File

@ -15,7 +15,7 @@ LISTS_DIR_O=/tmp/opkg-lists
LISTS_DIR=${IS_ROOT}${LISTS_DIR_O} LISTS_DIR=${IS_ROOT}${LISTS_DIR_O}
OPKG_CONF_DIR=${IS_ROOT}/etc/opkg OPKG_CONF_DIR=${IS_ROOT}/etc/opkg
OPKG_CONF_DIR_M=${IS_ROOT}/etc/opkg_m 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" FEEDS_SERVER_MIRRORS="https://repo.istoreos.com/repo"
DISABLE_MIRROR=false 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` 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 # for istore self upgrade
ISTORE_PKG=luci-app-store ISTORE_PKG=luci-app-store
ISTORE_DEP_PKGS="luci-lib-taskd luci-lib-xterm taskd" 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() { is_init() {
mkdir -p ${DL_DIR} ${LISTS_DIR} ${IS_ROOT}/etc ${IS_ROOT}/var mkdir -p ${DL_DIR} ${LISTS_DIR} ${IS_ROOT}/etc ${IS_ROOT}/var

View File

@ -1 +1 @@
src/gz istore_compat https://istore.linkease.com/repo/all/compat src/gz istore_compat https://istore.istoreos.com/repo/all/compat