mirror of
https://github.com/kiddin9/op-packages.git
synced 2026-10-31 07:25:13 +08:00
This commit is contained in:
github-actions[bot] committed
1 parent
d9f7c5c117
commit
26d174538f
57 files changed
+2774
-6425
No files matched your search
+9
-4
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
||||
PKG_NAME:=openlist2
|
||||
PKG_VERSION:=4.2.6
|
||||
PKG_WEB_VERSION:=4.2.6
|
||||
PKG_RELEASE:=15
|
||||
PKG_RELEASE:=16
|
||||
|
||||
PKG_SOURCE:=openlist-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://codeload.github.com/OpenListTeam/OpenList/tar.gz/v$(PKG_VERSION)?
|
||||
@@ -51,7 +51,8 @@ define Package/openlist2
|
||||
SUBMENU:=Web Servers/Proxies
|
||||
TITLE:=A file list program that supports multiple storage
|
||||
URL:=https://doc.oplist.org/
|
||||
DEPENDS:=$(GO_ARCH_DEPENDS) +ca-bundle
|
||||
DEPENDS:=$(GO_ARCH_DEPENDS) +ca-bundle +jshn +jsonfilter
|
||||
PROVIDES:=openlist2-helper
|
||||
endef
|
||||
|
||||
define Package/openlist2/conffiles
|
||||
@@ -84,10 +85,14 @@ define Package/openlist2/install
|
||||
$(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR))
|
||||
$(INSTALL_DIR) $(1)/usr/bin
|
||||
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/OpenList $(1)/usr/bin/openlist2
|
||||
$(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d $(1)/etc/openlist2
|
||||
$(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d $(1)/etc/openlist2 $(1)/etc/uci-defaults
|
||||
$(INSTALL_DIR) $(1)/usr/libexec $(1)/usr/share/openlist2
|
||||
$(INSTALL_CONF) $(CURDIR)/files/openlist2.config $(1)/etc/config/openlist2
|
||||
$(INSTALL_BIN) $(CURDIR)/files/openlist2.init $(1)/etc/init.d/openlist2
|
||||
$(INSTALL_DATA) $(CURDIR)/files/data.db $(1)/etc/openlist2/data.db
|
||||
$(INSTALL_DATA) $(CURDIR)/files/openlist2.common $(1)/usr/share/openlist2/functions.sh
|
||||
$(INSTALL_BIN) $(CURDIR)/files/openlist2.helper $(1)/usr/libexec/openlist2-helper
|
||||
$(INSTALL_BIN) $(CURDIR)/files/openlist2.defaults $(1)/etc/uci-defaults/99-openlist2
|
||||
$(INSTALL_CONF) $(CURDIR)/files/data.db $(1)/etc/openlist2/data.db
|
||||
endef
|
||||
|
||||
$(eval $(call Download,openlist-frontend))
|
||||
|
||||
Binary file not shown.
@@ -0,0 +1,252 @@
|
||||
#!/bin/sh
|
||||
# Shared validation for the service and its limited LuCI helper.
|
||||
|
||||
openlist2_error() {
|
||||
printf 'openlist2: %s\n' "$*" >&2
|
||||
logger -t openlist2 "$*" 2>/dev/null
|
||||
return 1
|
||||
}
|
||||
|
||||
openlist2_read_scalar() {
|
||||
# Preserve the value itself, including any trailing newline. Remove only
|
||||
# the one output terminator emitted by uci/jsonfilter.
|
||||
OPENLIST2_VALUE="$("$@"; printf '.')"
|
||||
OPENLIST2_VALUE="${OPENLIST2_VALUE%.}"
|
||||
OPENLIST2_VALUE="${OPENLIST2_VALUE%'
|
||||
'}"
|
||||
}
|
||||
|
||||
openlist2_port() {
|
||||
local value="$1"
|
||||
[ "$value" = "-1" ] && [ "${2:-0}" = "1" ] && { printf '%s\n' -1; return 0; }
|
||||
case "$value" in ''|*[!0-9]*) return 1 ;; esac
|
||||
value="$(printf '%s' "$value" | sed 's/^0*//')"
|
||||
[ -n "$value" ] && [ "${#value}" -le 5 ] || return 1
|
||||
[ "$value" -ge 1 ] && [ "$value" -le 65535 ] || return 1
|
||||
printf '%s\n' "$value"
|
||||
}
|
||||
|
||||
openlist2_safe_log_path() {
|
||||
local filename="${1##*/}"
|
||||
[ "$1" = "/var/log/$filename" ] || return 1
|
||||
case "$filename" in ''|*[!A-Za-z0-9._-]*) return 1 ;; esac
|
||||
printf '%s\n' "$1" | grep -Eq '^/var/log/openlist2([._-][A-Za-z0-9._-]+)?$' || return 1
|
||||
# Do not let a root helper follow a user-created log file symlink.
|
||||
[ ! -L "$1" ] && { [ ! -e "$1" ] || [ -f "$1" ]; }
|
||||
}
|
||||
|
||||
openlist2_normalize_dir() {
|
||||
local path="$1" suffix="" part
|
||||
case "$path" in /*) ;; *) return 1 ;; esac
|
||||
case "$path" in *'
|
||||
'*|*' '*|*"$(printf '\r')"*) return 1 ;; esac
|
||||
if printf '%s' "$path" | LC_ALL=C grep -q '[[:cntrl:]]'; then return 1; fi
|
||||
path="$(printf '%s' "$path" | sed 's://*:/:g; s:/*$::')"
|
||||
[ -n "$path" ] || path="/"
|
||||
case "$path/" in */../*|*/./*) return 1 ;; esac
|
||||
while [ ! -d "$path" ]; do
|
||||
[ ! -e "$path" ] && [ ! -L "$path" ] || return 1
|
||||
part="${path##*/}"
|
||||
suffix="/$part$suffix"
|
||||
path="${path%/*}"
|
||||
[ -n "$path" ] || path="/"
|
||||
done
|
||||
path="$(CDPATH='' cd "$path" 2>/dev/null && pwd -P && printf '.')" || return 1
|
||||
path="${path%.}"
|
||||
path="${path%'
|
||||
'}"
|
||||
case "$path" in *'
|
||||
'*) return 1 ;; esac
|
||||
if printf '%s' "$path" | LC_ALL=C grep -q '[[:cntrl:]]'; then return 1; fi
|
||||
[ "$path" != "/" ] || [ -n "$suffix" ] || { printf '/\n'; return 0; }
|
||||
printf '%s\n' "${path%/}$suffix"
|
||||
}
|
||||
|
||||
openlist2_contains_path() {
|
||||
case "$2/" in "$1/"*) return 0 ;; esac
|
||||
return 1
|
||||
}
|
||||
|
||||
openlist2_broad_dir() {
|
||||
case "$1" in
|
||||
''|/|/bin|/boot|/dev|/etc|/home|/lib|/lib64|/media|/mnt|/opt|/overlay|/proc|/root|/rom|/run|/sbin|/srv|/sys|/tmp|/usr|/var|/www|/tmp/log|/tmp/run|/usr/*|/bin/*|/sbin/*|/lib/*|/lib64/*|/dev/*|/proc/*|/sys/*|/rom/*|/overlay/*|/etc/config|/etc/config/*|/etc/dropbear|/etc/dropbear/*|/etc/ssl|/etc/ssl/*|/tmp/log/*|/www/*)
|
||||
return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
openlist2_mountpoint() {
|
||||
[ -d "$1" ] || return 1
|
||||
if command -v mountpoint >/dev/null 2>&1; then
|
||||
mountpoint -q "$1"
|
||||
return $?
|
||||
fi
|
||||
awk -v target="$1" '
|
||||
{
|
||||
p = $5
|
||||
gsub(/\\040/, " ", p)
|
||||
gsub(/\\134/, "\\", p)
|
||||
if (p == target) found = 1
|
||||
}
|
||||
END { exit !found }
|
||||
' /proc/self/mountinfo
|
||||
}
|
||||
|
||||
openlist2_validate_dirs() {
|
||||
data_dir="$(openlist2_normalize_dir "$data_dir")" ||
|
||||
{ openlist2_error "Data directory must be an absolute directory path without dot segments."; return 1; }
|
||||
temp_dir="$(openlist2_normalize_dir "$temp_dir")" ||
|
||||
{ openlist2_error "Cache directory must be an absolute directory path without dot segments."; return 1; }
|
||||
bleve_dir="$(openlist2_normalize_dir "${bleve_dir:-$data_dir/bleve}")" ||
|
||||
{ openlist2_error "Invalid Bleve index directory."; return 1; }
|
||||
local path protected
|
||||
for path in "$data_dir" "$temp_dir" "$bleve_dir"; do
|
||||
if openlist2_broad_dir "$path" || openlist2_mountpoint "$path"; then
|
||||
openlist2_error "Use a dedicated subdirectory, not a system directory or mount root: $path"
|
||||
return 1
|
||||
fi
|
||||
done
|
||||
case "$temp_dir" in
|
||||
/mnt/*|/media/*)
|
||||
path="${temp_dir#/}"; path="${path#*/}"
|
||||
case "$path" in */*) ;; *)
|
||||
openlist2_error "Use a cache subdirectory below the disk mount: $temp_dir"; return 1 ;;
|
||||
esac ;;
|
||||
esac
|
||||
if openlist2_contains_path "$temp_dir" "$data_dir" ||
|
||||
openlist2_contains_path "$bleve_dir" "$data_dir" ||
|
||||
openlist2_contains_path "$temp_dir" "$bleve_dir" ||
|
||||
openlist2_contains_path "$bleve_dir" "$temp_dir"; then
|
||||
openlist2_error "Cache and index directories must be separate and must not contain the data directory."
|
||||
return 1
|
||||
fi
|
||||
if [ -n "$dist_dir" ]; then
|
||||
dist_dir="$(openlist2_normalize_dir "$dist_dir")" || return 1
|
||||
if openlist2_broad_dir "$dist_dir" || openlist2_mountpoint "$dist_dir" ||
|
||||
openlist2_contains_path "$dist_dir" "$data_dir" ||
|
||||
openlist2_contains_path "$dist_dir" "$temp_dir" ||
|
||||
openlist2_contains_path "$temp_dir" "$dist_dir" ||
|
||||
openlist2_contains_path "$dist_dir" "$bleve_dir" ||
|
||||
openlist2_contains_path "$bleve_dir" "$dist_dir"; then
|
||||
openlist2_error "Frontend files must be separate from private data, cache and index files."
|
||||
return 1
|
||||
fi
|
||||
[ -f "$dist_dir/index.html" ] && [ -r "$dist_dir/index.html" ] ||
|
||||
{ openlist2_error "The frontend directory must contain a readable index.html."; return 1; }
|
||||
fi
|
||||
# shellcheck disable=SC2154
|
||||
for path in "$ssl_cert" "$ssl_key"; do
|
||||
[ -n "$path" ] || continue
|
||||
protected="$(readlink -f "$path" 2>/dev/null)" || protected="$path"
|
||||
if openlist2_contains_path "$temp_dir" "$protected" ||
|
||||
{ [ -n "$dist_dir" ] && openlist2_contains_path "$dist_dir" "$protected"; }; then
|
||||
openlist2_error "TLS files must not be inside the cache or public frontend directory."
|
||||
return 1
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
openlist2_prepare_dirs() {
|
||||
local entry identity previous registered marker="$data_dir/.temp-dir"
|
||||
umask 077
|
||||
mkdir -p "$data_dir" "$temp_dir" "$bleve_dir" ||
|
||||
{ openlist2_error "Unable to create data, cache or index directory."; return 1; }
|
||||
[ ! -L "$data_dir/config.json" ] && [ ! -L "$marker" ] ||
|
||||
{ openlist2_error "Config and cache ownership files must not be symlinks."; return 1; }
|
||||
[ ! -e "$data_dir/config.json" ] || [ -f "$data_dir/config.json" ] ||
|
||||
{ openlist2_error "config.json must be a regular file."; return 1; }
|
||||
[ ! -e "$marker" ] || [ -f "$marker" ] ||
|
||||
{ openlist2_error "Cache ownership marker must be a regular file."; return 1; }
|
||||
entry="$(find "$temp_dir" -mindepth 1 -maxdepth 1 -print -quit)" || return 1
|
||||
identity="$(stat -c '%d:%i' "$temp_dir")" || return 1
|
||||
registered="$(cat "$marker" 2>/dev/null)"
|
||||
if [ -n "$entry" ] && [ "$registered" != "$(printf '%s\n%s' "$temp_dir" "$identity")" ]; then
|
||||
# An existing config identifies the old cache on the first upgrade.
|
||||
# Once registered, an inode/device change must never inherit ownership.
|
||||
previous=""
|
||||
if [ ! -e "$marker" ] && [ -s "$data_dir/config.json" ]; then
|
||||
openlist2_read_scalar jsonfilter -qi "$data_dir/config.json" -e '@.temp_dir' 2>/dev/null
|
||||
previous="$OPENLIST2_VALUE"
|
||||
previous="$(openlist2_normalize_dir "$previous")" || previous=""
|
||||
fi
|
||||
[ "$previous" = "$temp_dir" ] ||
|
||||
{ openlist2_error "Refusing to clear a non-empty, unregistered cache directory. Choose a new empty subdirectory: $temp_dir"; return 1; }
|
||||
fi
|
||||
chmod 700 "$data_dir" "$temp_dir" "$bleve_dir" || return 1
|
||||
# Keep the marker outside the cache: OpenList clears cache contents.
|
||||
(
|
||||
local marker_tmp
|
||||
marker_tmp="$(mktemp "$data_dir/.temp-dir.XXXXXX")" || exit 1
|
||||
trap 'rm -f "$marker_tmp"' 0
|
||||
printf '%s\n%s\n' "$temp_dir" "$identity" > "$marker_tmp" &&
|
||||
chmod 600 "$marker_tmp" && mv -f "$marker_tmp" "$marker"
|
||||
) || { openlist2_error "Unable to record cache directory ownership."; return 1; }
|
||||
}
|
||||
|
||||
openlist2_migrate_config() {
|
||||
local prefix='openlist2.@openlist2[0]' old_port old_ssl http https changed=0 size backups schema legacy
|
||||
uci -q get "$prefix" >/dev/null || return 0
|
||||
old_port="$(uci -q get "$prefix.port")"
|
||||
old_ssl="$(uci -q get "$prefix.ssl")"
|
||||
http="$(uci -q get "$prefix.listen_http_port")"
|
||||
https="$(uci -q get "$prefix.listen_https_port")"
|
||||
if { [ -z "$http" ] || [ -z "$https" ]; } && { [ -n "$old_port" ] || [ -n "$old_ssl" ]; }; then
|
||||
old_port="$(openlist2_port "${old_port:-5244}")" ||
|
||||
{ openlist2_error "Invalid legacy listen port; migration stopped."; return 1; }
|
||||
case "$old_ssl" in 1|on|true|yes|enabled) http="${http:--1}"; https="${https:-$old_port}" ;; *)
|
||||
http="${http:-$old_port}"; https="${https:--1}" ;;
|
||||
esac
|
||||
uci set "$prefix.listen_http_port=$http" &&
|
||||
uci set "$prefix.listen_https_port=$https" || return 1
|
||||
changed=1
|
||||
fi
|
||||
if [ -n "$http" ] || [ -n "$https" ]; then
|
||||
legacy="$(openlist2_port "$old_port" 2>/dev/null)" || legacy=""
|
||||
if [ -n "$legacy" ]; then
|
||||
uci set "$prefix.legacy_firewall_port=$legacy" || return 1
|
||||
fi
|
||||
if [ -n "$old_port" ]; then uci -q delete "$prefix.port" || return 1; changed=1; fi
|
||||
if [ -n "$old_ssl" ]; then uci -q delete "$prefix.ssl" || return 1; changed=1; fi
|
||||
fi
|
||||
schema="$(uci -q get "$prefix.config_version")"
|
||||
if [ "$schema" != "2" ]; then
|
||||
size="$(uci -q get "$prefix.log_max_size")"
|
||||
backups="$(uci -q get "$prefix.log_max_backups")"
|
||||
case "$size:$backups" in
|
||||
50:30|10:5)
|
||||
uci set "$prefix.log_max_size=1" && uci set "$prefix.log_max_backups=3" || return 1 ;;
|
||||
esac
|
||||
# These switches have no implementation in OpenList 4.2.6.
|
||||
uci -q delete "$prefix.upload_task_persistant"
|
||||
uci -q delete "$prefix.decompress_upload_task_persistant"
|
||||
uci set "$prefix.config_version=2" || return 1
|
||||
changed=1
|
||||
fi
|
||||
# Retry a previously staged migration if its commit failed.
|
||||
if [ "$changed" = "1" ] || uci -q changes openlist2 | grep -q '\.config_version='; then
|
||||
uci commit openlist2 || { openlist2_error "Unable to save migrated UCI configuration."; return 1; }
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
openlist2_pasv_ports() {
|
||||
local values="$1" item first last result="" oldifs="$IFS" noglob=0
|
||||
case "$values" in *[!0-9,\ -]*) return 1 ;; esac
|
||||
case "$-" in *f*) noglob=1 ;; *) set -f ;; esac
|
||||
IFS=' ,'
|
||||
for item in $values; do
|
||||
IFS="$oldifs"
|
||||
first="${item%%-*}"; last="${item#*-}"
|
||||
first="$(openlist2_port "$first")" && last="$(openlist2_port "$last")" &&
|
||||
[ "$first" -ge 1024 ] && [ "$first" -le "$last" ] || {
|
||||
[ "$noglob" = "1" ] || set +f
|
||||
return 1
|
||||
}
|
||||
if [ "$first" = "$last" ]; then item="$first"; else item="$first-$last"; fi
|
||||
result="${result:+$result }$item"
|
||||
IFS=' ,'
|
||||
done
|
||||
IFS="$oldifs"
|
||||
[ "$noglob" = "1" ] || set +f
|
||||
printf '%s\n' "$result"
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
|
||||
config openlist2
|
||||
option config_version '2'
|
||||
option enabled '0'
|
||||
option debug '0'
|
||||
option delayed_start '0'
|
||||
@@ -15,10 +16,12 @@ config openlist2
|
||||
option tls_insecure_skip_verify '0'
|
||||
option data_dir '/etc/openlist2'
|
||||
option temp_dir '/tmp/openlist2'
|
||||
option bleve_dir ''
|
||||
option dist_dir ''
|
||||
option log '1'
|
||||
option log_path '/var/log/openlist2.log'
|
||||
option log_max_size '50'
|
||||
option log_max_backups '30'
|
||||
option log_max_size '1'
|
||||
option log_max_backups '3'
|
||||
option log_max_age '28'
|
||||
option log_compress '0'
|
||||
option log_filter '0'
|
||||
@@ -44,7 +47,6 @@ config openlist2
|
||||
option transfer_task_persistant '0'
|
||||
option upload_workers '5'
|
||||
option upload_max_retry '0'
|
||||
option upload_task_persistant '0'
|
||||
option copy_workers '5'
|
||||
option copy_max_retry '2'
|
||||
option copy_task_persistant '0'
|
||||
@@ -56,7 +58,6 @@ config openlist2
|
||||
option decompress_task_persistant '0'
|
||||
option decompress_upload_workers '5'
|
||||
option decompress_upload_max_retry '2'
|
||||
option decompress_upload_task_persistant '0'
|
||||
option allow_retry_canceled '0'
|
||||
option cors_allow_origins '*'
|
||||
option cors_allow_methods '*'
|
||||
@@ -66,6 +67,8 @@ config openlist2
|
||||
option s3_ssl '0'
|
||||
option ftp '0'
|
||||
option ftp_port '5221'
|
||||
# Listening ports matching the passive port mapping in OpenList's FTP settings.
|
||||
# Example: list ftp_pasv_ports '50000-50100'
|
||||
option find_pasv_port_attempts '50'
|
||||
option active_transfer_port_non_20 '0'
|
||||
option idle_timeout '900'
|
||||
|
||||
Executable
+4
@@ -0,0 +1,4 @@
|
||||
#!/bin/sh
|
||||
|
||||
. /usr/share/openlist2/functions.sh
|
||||
openlist2_migrate_config
|
||||
Executable
+46
@@ -0,0 +1,46 @@
|
||||
#!/bin/sh
|
||||
# The ACL grants individual verb names, never this executable with arbitrary arguments.
|
||||
|
||||
. /usr/share/openlist2/functions.sh
|
||||
umask 077
|
||||
|
||||
[ "$#" -eq 1 ] || { openlist2_error "Exactly one helper action is required."; exit 64; }
|
||||
|
||||
case "$1" in
|
||||
log-read|log-clear)
|
||||
openlist2_read_scalar uci -q get 'openlist2.@openlist2[0].log_path'
|
||||
log_path="$OPENLIST2_VALUE"
|
||||
log_path="${log_path:-/var/log/openlist2.log}"
|
||||
openlist2_safe_log_path "$log_path" ||
|
||||
{ openlist2_error "Unsafe log path or non-regular log file."; exit 1; }
|
||||
if [ "$1" = "log-read" ]; then
|
||||
[ -e "$log_path" ] || exit 0
|
||||
[ -r "$log_path" ] || { openlist2_error "Log file is not readable."; exit 1; }
|
||||
# Bound output before line selection, including logs with a very long line.
|
||||
log_data="$(tail -c 16383 "$log_path")" || exit 1
|
||||
printf '%s\n' "$log_data" | tail -n 200
|
||||
else
|
||||
[ -e "$log_path" ] || exit 0
|
||||
chmod 600 "$log_path" && : > "$log_path"
|
||||
fi
|
||||
;;
|
||||
password-reset)
|
||||
openlist2_read_scalar uci -q get 'openlist2.@openlist2[0].data_dir'
|
||||
data_dir="$OPENLIST2_VALUE"
|
||||
data_dir="$(openlist2_normalize_dir "${data_dir:-/etc/openlist2}")" ||
|
||||
{ openlist2_error "Invalid data directory."; exit 1; }
|
||||
if openlist2_broad_dir "$data_dir" || openlist2_mountpoint "$data_dir"; then
|
||||
openlist2_error "Use a dedicated data subdirectory."; exit 1
|
||||
fi
|
||||
[ ! -L "$data_dir/config.json" ] && [ -f "$data_dir/config.json" ] &&
|
||||
[ -s "$data_dir/config.json" ] ||
|
||||
{ openlist2_error "Start OpenList once with the saved settings before resetting the password."; exit 1; }
|
||||
jsonfilter -qi "$data_dir/config.json" -e '@' >/dev/null ||
|
||||
{ openlist2_error "Invalid config.json; password was not reset."; exit 1; }
|
||||
exec /usr/bin/openlist2 admin random --data "$data_dir" --no-prefix
|
||||
;;
|
||||
*)
|
||||
openlist2_error "Unsupported helper action."
|
||||
exit 64
|
||||
;;
|
||||
esac
|
||||
+212
-107
@@ -1,25 +1,15 @@
|
||||
#!/bin/sh /etc/rc.common
|
||||
# UCI config_get assigns variables; rc.common consumes START and USE_PROCD.
|
||||
# The && chains deliberately handle failure from every command.
|
||||
# shellcheck disable=SC2034,SC2154,SC2015
|
||||
|
||||
. /usr/share/libubox/jshn.sh
|
||||
. /usr/share/openlist2/functions.sh
|
||||
|
||||
START=99
|
||||
USE_PROCD=1
|
||||
PROG=/usr/bin/openlist2
|
||||
|
||||
is_safe_log_path() {
|
||||
local path="$1"
|
||||
local base="${path##*/}"
|
||||
|
||||
case "$path" in
|
||||
/var/log/*) ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
|
||||
[ "$path" = "/var/log/$base" ] || return 1
|
||||
|
||||
printf '%s\n' "$base" | grep -Eq '^openlist2([._-][A-Za-z0-9._-]+)?$'
|
||||
}
|
||||
|
||||
append_dest_port() {
|
||||
local value="$1"
|
||||
|
||||
@@ -65,19 +55,24 @@ json_add_csv_array() {
|
||||
}
|
||||
|
||||
get_config() {
|
||||
# LuCI manages the first section and procd runs one instance.
|
||||
[ -z "$section_id" ] || return 0
|
||||
section_id="$1"
|
||||
uci_changed=0
|
||||
|
||||
config_get_bool enabled "$1" enabled 1
|
||||
config_get debug "$1" debug 0
|
||||
config_get allow_wan "$1" allow_wan 0
|
||||
config_get_bool debug "$1" debug 0
|
||||
config_get_bool allow_wan "$1" allow_wan 0
|
||||
config_get delayed_start "$1" delayed_start 0
|
||||
|
||||
config_get force "$1" force 1
|
||||
config_get_bool force "$1" force 1
|
||||
config_get site_url "$1" site_url ""
|
||||
config_get cdn "$1" cdn ""
|
||||
config_get jwt_secret "$1" jwt_secret ""
|
||||
config_get data_dir "$1" data_dir "/etc/openlist2"
|
||||
config_get temp_dir "$1" temp_dir "/tmp/openlist2"
|
||||
config_get bleve_dir "$1" bleve_dir ""
|
||||
config_get dist_dir "$1" dist_dir ""
|
||||
config_get token_expires_in "$1" token_expires_in 48
|
||||
config_get proxy_address "$1" proxy_address ""
|
||||
config_get auto_memory_limit "$1" auto_memory_limit 4
|
||||
@@ -85,27 +80,27 @@ get_config() {
|
||||
config_get max_block_limit "$1" max_block_limit 0
|
||||
config_get max_connections "$1" max_connections 0
|
||||
config_get max_concurrency "$1" max_concurrency 64
|
||||
config_get tls_insecure_skip_verify "$1" tls_insecure_skip_verify 0
|
||||
config_get_bool tls_insecure_skip_verify "$1" tls_insecure_skip_verify 0
|
||||
|
||||
# log
|
||||
config_get log "$1" log 1
|
||||
config_get_bool log "$1" log 1
|
||||
config_get log_path "$1" log_path '/var/log/openlist2.log'
|
||||
if ! is_safe_log_path "$log_path"; then
|
||||
if ! openlist2_safe_log_path "$log_path"; then
|
||||
log_path='/var/log/openlist2.log'
|
||||
uci -q set openlist2.@openlist2[0].log_path="$log_path"
|
||||
uci -q set "openlist2.$section_id.log_path=$log_path" || { config_error=1; return 1; }
|
||||
uci_changed=1
|
||||
fi
|
||||
config_get log_max_size "$1" log_max_size 50
|
||||
config_get log_max_backups "$1" log_max_backups 30
|
||||
config_get log_max_size "$1" log_max_size 1
|
||||
config_get log_max_backups "$1" log_max_backups 3
|
||||
config_get log_max_age "$1" log_max_age 28
|
||||
config_get log_compress "$1" log_compress 0
|
||||
config_get log_filter "$1" log_filter 0
|
||||
config_get_bool log_compress "$1" log_compress 0
|
||||
config_get_bool log_filter "$1" log_filter 0
|
||||
config_get log_filter_cidr "$1" log_filter_cidr ""
|
||||
config_get log_filter_path "$1" log_filter_path ""
|
||||
config_get log_filter_method "$1" log_filter_method ""
|
||||
|
||||
# scheme
|
||||
config_get force_https "$1" force_https 0
|
||||
config_get_bool force_https "$1" force_https 0
|
||||
config_get ssl_cert "$1" ssl_cert ""
|
||||
config_get ssl_key "$1" ssl_key ""
|
||||
config_get listen_addr "$1" listen_addr "0.0.0.0"
|
||||
@@ -113,8 +108,8 @@ get_config() {
|
||||
config_get listen_https_port "$1" listen_https_port "-1"
|
||||
config_get listen_unix_file "$1" listen_unix_file ""
|
||||
config_get listen_unix_file_perm "$1" listen_unix_file_perm ""
|
||||
config_get listen_enable_h2c "$1" listen_enable_h2c 0
|
||||
config_get listen_enable_h3 "$1" listen_enable_h3 0
|
||||
config_get_bool listen_enable_h2c "$1" listen_enable_h2c 0
|
||||
config_get_bool listen_enable_h3 "$1" listen_enable_h3 0
|
||||
|
||||
# database
|
||||
config_get database_type "$1" database_type "sqlite3"
|
||||
@@ -137,26 +132,24 @@ get_config() {
|
||||
# tasks
|
||||
config_get download_workers "$1" download_workers 5
|
||||
config_get download_max_retry "$1" download_max_retry 1
|
||||
config_get download_task_persistant "$1" download_task_persistant 0
|
||||
config_get_bool download_task_persistant "$1" download_task_persistant 0
|
||||
config_get transfer_workers "$1" transfer_workers 5
|
||||
config_get transfer_max_retry "$1" transfer_max_retry 2
|
||||
config_get transfer_task_persistant "$1" transfer_task_persistant 0
|
||||
config_get_bool transfer_task_persistant "$1" transfer_task_persistant 0
|
||||
config_get upload_workers "$1" upload_workers 5
|
||||
config_get upload_max_retry "$1" upload_max_retry 0
|
||||
config_get upload_task_persistant "$1" upload_task_persistant 0
|
||||
config_get copy_workers "$1" copy_workers 5
|
||||
config_get copy_max_retry "$1" copy_max_retry 2
|
||||
config_get copy_task_persistant "$1" copy_task_persistant 0
|
||||
config_get_bool copy_task_persistant "$1" copy_task_persistant 0
|
||||
config_get move_workers "$1" move_workers 5
|
||||
config_get move_max_retry "$1" move_max_retry 2
|
||||
config_get move_task_persistant "$1" move_task_persistant 0
|
||||
config_get_bool move_task_persistant "$1" move_task_persistant 0
|
||||
config_get decompress_workers "$1" decompress_workers 5
|
||||
config_get decompress_max_retry "$1" decompress_max_retry 2
|
||||
config_get decompress_task_persistant "$1" decompress_task_persistant 0
|
||||
config_get_bool decompress_task_persistant "$1" decompress_task_persistant 0
|
||||
config_get decompress_upload_workers "$1" decompress_upload_workers 5
|
||||
config_get decompress_upload_max_retry "$1" decompress_upload_max_retry 2
|
||||
config_get decompress_upload_task_persistant "$1" decompress_upload_task_persistant 0
|
||||
config_get allow_retry_canceled "$1" allow_retry_canceled 0
|
||||
config_get_bool allow_retry_canceled "$1" allow_retry_canceled 0
|
||||
|
||||
# cors
|
||||
config_get cors_allow_origins "$1" cors_allow_origins '*'
|
||||
@@ -164,96 +157,205 @@ get_config() {
|
||||
config_get cors_allow_headers "$1" cors_allow_headers '*'
|
||||
|
||||
# s3
|
||||
config_get s3 "$1" s3 0
|
||||
config_get_bool s3 "$1" s3 0
|
||||
config_get s3_port "$1" s3_port 5246
|
||||
config_get s3_ssl "$1" s3_ssl 0
|
||||
config_get_bool s3_ssl "$1" s3_ssl 0
|
||||
|
||||
# ftp
|
||||
config_get ftp "$1" ftp 0
|
||||
config_get_bool ftp "$1" ftp 0
|
||||
config_get ftp_port "$1" ftp_port 5221
|
||||
config_get ftp_pasv_ports "$1" ftp_pasv_ports ""
|
||||
config_get find_pasv_port_attempts "$1" find_pasv_port_attempts 50
|
||||
config_get active_transfer_port_non_20 "$1" active_transfer_port_non_20 0
|
||||
config_get_bool active_transfer_port_non_20 "$1" active_transfer_port_non_20 0
|
||||
config_get idle_timeout "$1" idle_timeout 900
|
||||
config_get connection_timeout "$1" connection_timeout 30
|
||||
config_get disable_active_mode "$1" disable_active_mode 0
|
||||
config_get default_transfer_binary "$1" default_transfer_binary 0
|
||||
config_get enable_active_conn_ip_check "$1" enable_active_conn_ip_check 1
|
||||
config_get enable_pasv_conn_ip_check "$1" enable_pasv_conn_ip_check 1
|
||||
config_get_bool disable_active_mode "$1" disable_active_mode 0
|
||||
config_get_bool default_transfer_binary "$1" default_transfer_binary 0
|
||||
config_get_bool enable_active_conn_ip_check "$1" enable_active_conn_ip_check 1
|
||||
config_get_bool enable_pasv_conn_ip_check "$1" enable_pasv_conn_ip_check 1
|
||||
|
||||
# sftp
|
||||
config_get sftp "$1" sftp 0
|
||||
config_get_bool sftp "$1" sftp 0
|
||||
config_get sftp_port "$1" sftp_port 5222
|
||||
|
||||
# mcp
|
||||
config_get mcp "$1" mcp 0
|
||||
config_get_bool mcp "$1" mcp 0
|
||||
|
||||
# init jwt_secret
|
||||
if [ -z "$jwt_secret" ]; then
|
||||
jwt_secret=$(tr -cd "a-zA-Z0-9" < "/dev/urandom" | head -c16)
|
||||
uci -q set openlist2.@openlist2[0].jwt_secret="$jwt_secret"
|
||||
[ "${#jwt_secret}" -eq 16 ] || { config_error=1; return 1; }
|
||||
uci -q set "openlist2.$section_id.jwt_secret=$jwt_secret" || { config_error=1; return 1; }
|
||||
uci_changed=1
|
||||
fi
|
||||
[ "$uci_changed" = "1" ] && uci commit openlist2
|
||||
if [ "$uci_changed" = "1" ]; then
|
||||
uci commit openlist2 || { config_error=1; return 1; }
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
validate_config() {
|
||||
http_port="$(openlist2_port "${listen_http_port:-5244}" 1)" &&
|
||||
https_port="$(openlist2_port "${listen_https_port:--1}" 1)" &&
|
||||
s3_port="$(openlist2_port "$s3_port")" &&
|
||||
ftp_port="$(openlist2_port "$ftp_port")" &&
|
||||
sftp_port="$(openlist2_port "$sftp_port")" ||
|
||||
{ openlist2_error "Invalid listen port. Use 1-65535, or -1 to disable HTTP/HTTPS."; return 1; }
|
||||
if [ "$ftp" = "1" ] && [ "$allow_wan" = "1" ]; then
|
||||
ftp_pasv_ports="$(openlist2_pasv_ports "$ftp_pasv_ports")" ||
|
||||
{ openlist2_error "FTP passive firewall ports must be ports or ranges within 1024-65535."; return 1; }
|
||||
else
|
||||
ftp_pasv_ports=""
|
||||
fi
|
||||
if [ "$https_port" = "-1" ] && { [ "$listen_enable_h3" = "1" ] || [ "$force_https" = "1" ]; }; then
|
||||
openlist2_error "Force HTTPS and HTTP/3 require an enabled HTTPS port."
|
||||
return 1
|
||||
fi
|
||||
if [ "$https_port" != "-1" ] || { [ "$s3" = "1" ] && [ "$s3_ssl" = "1" ]; }; then
|
||||
local file
|
||||
for file in "$ssl_cert" "$ssl_key"; do
|
||||
case "$file" in /*) ;; *)
|
||||
openlist2_error "HTTPS/S3 TLS requires absolute certificate and key paths."; return 1 ;;
|
||||
esac
|
||||
[ -f "$file" ] && [ -r "$file" ] && [ -s "$file" ] ||
|
||||
{ openlist2_error "TLS certificate/key is missing, empty or unreadable: $file"; return 1; }
|
||||
done
|
||||
fi
|
||||
if [ -n "$listen_unix_file" ]; then
|
||||
case "$listen_unix_file" in /*) ;; *)
|
||||
openlist2_error "Unix socket path must be absolute."; return 1 ;;
|
||||
esac
|
||||
[ ! -e "$listen_unix_file" ] || [ -S "$listen_unix_file" ] ||
|
||||
{ openlist2_error "Unix socket path is occupied by a non-socket file."; return 1; }
|
||||
fi
|
||||
if [ -n "$listen_unix_file_perm" ]; then
|
||||
printf '%s\n' "$listen_unix_file_perm" | grep -Eq '^[0-7]{3,4}$' ||
|
||||
{ openlist2_error "Unix socket permissions must contain 3 or 4 octal digits."; return 1; }
|
||||
fi
|
||||
local ports="" port item first last
|
||||
dest_ports=""
|
||||
append_dest_port "$http_port"
|
||||
append_dest_port "$https_port"
|
||||
[ "$s3" = "1" ] && append_dest_port "$s3_port"
|
||||
[ "$ftp" = "1" ] && append_dest_port "$ftp_port"
|
||||
[ "$sftp" = "1" ] && append_dest_port "$sftp_port"
|
||||
for port in $dest_ports; do
|
||||
case " $ports " in *" $port "*)
|
||||
openlist2_error "Enabled services cannot share TCP port $port."; return 1 ;;
|
||||
esac
|
||||
ports="$ports $port"
|
||||
if [ "$ftp" = "1" ]; then
|
||||
for item in $ftp_pasv_ports; do
|
||||
first="${item%%-*}"; last="${item#*-}"
|
||||
if [ "$port" -ge "$first" ] && [ "$port" -le "$last" ]; then
|
||||
openlist2_error "FTP passive ports must not overlap service port $port."; return 1
|
||||
fi
|
||||
done
|
||||
fi
|
||||
done
|
||||
if [ "$log" = "1" ] && ! [ "$log_max_size" -ge 1 ] 2>/dev/null; then
|
||||
openlist2_error "Log size must be at least 1 MB."
|
||||
return 1
|
||||
fi
|
||||
openlist2_validate_dirs
|
||||
}
|
||||
|
||||
write_config() (
|
||||
local config_tmp
|
||||
umask 077
|
||||
config_tmp="$(mktemp "$data_dir/.config.json.XXXXXX")" || exit 1
|
||||
trap 'rm -f "$config_tmp"' 0
|
||||
trap 'exit 1' HUP INT TERM
|
||||
json_dump > "$config_tmp" &&
|
||||
jsonfilter -qi "$config_tmp" -e '@' >/dev/null &&
|
||||
chmod 600 "$config_tmp" &&
|
||||
mv -f "$config_tmp" "$data_dir/config.json"
|
||||
)
|
||||
|
||||
set_firewall_rule() {
|
||||
local section="$1" name="$2" proto="$3" ports="$4"
|
||||
if [ -z "$ports" ]; then
|
||||
if uci -q get "firewall.$section" >/dev/null; then
|
||||
uci -q delete "firewall.$section" || return 1
|
||||
firewall_changed=1
|
||||
fi
|
||||
return 0
|
||||
fi
|
||||
if [ "$(uci -q get "firewall.$section")" = "rule" ] &&
|
||||
[ "$(uci -q get "firewall.$section.name")" = "$name" ] &&
|
||||
[ "$(uci -q get "firewall.$section.src")" = "wan" ] &&
|
||||
[ "$(uci -q get "firewall.$section.target")" = "ACCEPT" ] &&
|
||||
[ "$(uci -q get "firewall.$section.proto")" = "$proto" ] &&
|
||||
[ "$(uci -q get "firewall.$section.dest_port")" = "$ports" ] &&
|
||||
[ "$(uci -q get "firewall.$section.enabled")" = "1" ]; then
|
||||
return 0
|
||||
fi
|
||||
uci -q delete "firewall.$section"
|
||||
uci set "firewall.$section=rule" &&
|
||||
uci set "firewall.$section.name=$name" &&
|
||||
uci set "firewall.$section.target=ACCEPT" &&
|
||||
uci set "firewall.$section.src=wan" &&
|
||||
uci set "firewall.$section.proto=$proto" &&
|
||||
uci set "firewall.$section.dest_port=$ports" &&
|
||||
uci set "firewall.$section.enabled=1" || return 1
|
||||
firewall_changed=1
|
||||
}
|
||||
|
||||
set_firewall() {
|
||||
local quic_ports="" legacy legacy_ports
|
||||
firewall_changed=0
|
||||
legacy="$(uci -q get 'openlist2.@openlist2[0].legacy_firewall_port')"
|
||||
legacy_ports="$(uci -q get firewall.openlist.dest_port)"
|
||||
# Only retire an old rule when the migrated config and rule fingerprint agree.
|
||||
if [ -n "$legacy" ] &&
|
||||
[ "$(uci -q get firewall.openlist.name)" = "openlist" ] &&
|
||||
[ "$(uci -q get firewall.openlist.src)" = "wan" ] &&
|
||||
[ "$(uci -q get firewall.openlist.target)" = "ACCEPT" ] &&
|
||||
[ "$(uci -q get firewall.openlist.proto)" = "tcp" ]; then
|
||||
case " $legacy_ports " in *" $legacy "*)
|
||||
uci -q delete firewall.openlist || return 1
|
||||
firewall_changed=1 ;;
|
||||
esac
|
||||
fi
|
||||
dest_ports=""
|
||||
if [ "$external_access" = "allow" ]; then
|
||||
dest_ports=""
|
||||
append_dest_port "$http_port"
|
||||
append_dest_port "$https_port"
|
||||
[ "$s3" = "1" ] && append_dest_port "$s3_port"
|
||||
[ "$ftp" = "1" ] && append_dest_port "$ftp_port"
|
||||
if [ "$ftp" = "1" ]; then
|
||||
append_dest_port "$ftp_port"
|
||||
append_dest_port "$ftp_pasv_ports"
|
||||
fi
|
||||
[ "$sftp" = "1" ] && append_dest_port "$sftp_port"
|
||||
|
||||
uci -q delete firewall.openlist
|
||||
uci -q delete firewall.openlist2
|
||||
uci -q delete firewall.openlist2_quic
|
||||
if [ -z "$dest_ports" ]; then
|
||||
uci commit firewall
|
||||
/etc/init.d/firewall reload >/dev/null 2>&1
|
||||
return 0
|
||||
fi
|
||||
|
||||
uci set firewall.openlist2=rule
|
||||
uci set firewall.openlist2.name="openlist2"
|
||||
uci set firewall.openlist2.target="ACCEPT"
|
||||
uci set firewall.openlist2.src="wan"
|
||||
uci set firewall.openlist2.proto="tcp"
|
||||
uci set firewall.openlist2.dest_port="$dest_ports"
|
||||
uci set firewall.openlist2.enabled="1"
|
||||
if [ "$listen_enable_h3" = "1" ] && [ -n "$https_port" ] && [ "$https_port" != "-1" ]; then
|
||||
uci set firewall.openlist2_quic=rule
|
||||
uci set firewall.openlist2_quic.name="openlist2 QUIC"
|
||||
uci set firewall.openlist2_quic.target="ACCEPT"
|
||||
uci set firewall.openlist2_quic.src="wan"
|
||||
uci set firewall.openlist2_quic.proto="udp"
|
||||
uci set firewall.openlist2_quic.dest_port="$https_port"
|
||||
uci set firewall.openlist2_quic.enabled="1"
|
||||
fi
|
||||
uci commit firewall
|
||||
/etc/init.d/firewall reload >/dev/null 2>&1
|
||||
elif [ "$external_access" = "deny" ]; then
|
||||
uci -q delete firewall.openlist
|
||||
uci -q delete firewall.openlist2
|
||||
uci -q delete firewall.openlist2_quic
|
||||
uci commit firewall
|
||||
/etc/init.d/firewall reload >/dev/null 2>&1
|
||||
[ "$listen_enable_h3" = "1" ] && quic_ports="$https_port"
|
||||
fi
|
||||
set_firewall_rule openlist2 openlist2 tcp "$dest_ports" &&
|
||||
set_firewall_rule openlist2_quic "openlist2 QUIC" udp "$quic_ports" || return 1
|
||||
if [ "$firewall_changed" = "1" ] || uci -q changes firewall | grep -Eq '^[-+]?firewall\.openlist'; then
|
||||
uci commit firewall && /etc/init.d/firewall reload || {
|
||||
openlist2_error "Unable to apply OpenList firewall rules."
|
||||
return 1
|
||||
}
|
||||
fi
|
||||
if [ -n "$legacy" ]; then
|
||||
uci -q delete 'openlist2.@openlist2[0].legacy_firewall_port' && uci commit openlist2 || return 1
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
start_service() {
|
||||
config_load openlist2
|
||||
openlist2_migrate_config || return 1
|
||||
config_load openlist2 || return 1
|
||||
section_id=""
|
||||
config_error=0
|
||||
config_foreach get_config openlist2
|
||||
|
||||
# Remove firewall rules when stopping openlist process via uci
|
||||
external_access="deny" set_firewall
|
||||
|
||||
[ "$enabled" -ne 1 ] && return 1
|
||||
mkdir -p "$temp_dir" "$data_dir"
|
||||
[ -n "$listen_http_port" ] || listen_http_port="5244"
|
||||
[ -n "$listen_https_port" ] || listen_https_port="-1"
|
||||
http_port="$listen_http_port"
|
||||
https_port="$listen_https_port"
|
||||
[ -n "$section_id" ] && [ "$config_error" = "0" ] ||
|
||||
{ openlist2_error "Unable to load or save OpenList configuration."; return 1; }
|
||||
if [ "$enabled" != "1" ]; then
|
||||
external_access="deny" set_firewall
|
||||
return $?
|
||||
fi
|
||||
validate_config && openlist2_prepare_dirs || return 1
|
||||
if [ -e /proc/uptime ]; then
|
||||
boot_uptime="$(awk -F. '{print $1}' /proc/uptime)"
|
||||
[ "$boot_uptime" -lt "120" ] || delayed_start=0
|
||||
@@ -261,11 +363,13 @@ start_service() {
|
||||
|
||||
[ "$allow_wan" -eq "1" ] && external_access="allow" || external_access="deny"
|
||||
|
||||
set_firewall
|
||||
|
||||
log_dir="${log_path%/*}"
|
||||
[ "$log_dir" != "$log_path" ] && mkdir -p "$log_dir"
|
||||
: > "$log_path"
|
||||
if [ "$log" = "1" ]; then
|
||||
openlist2_safe_log_path "$log_path" ||
|
||||
{ openlist2_error "Unsafe log path or non-regular log file."; return 1; }
|
||||
log_dir="${log_path%/*}"
|
||||
mkdir -p "$log_dir" && : >> "$log_path" && chmod 600 "$log_path" ||
|
||||
{ openlist2_error "Unable to open the log file."; return 1; }
|
||||
fi
|
||||
|
||||
last_launched_version=""
|
||||
if command -v jsonfilter >/dev/null 2>&1 && [ -s "$data_dir/config.json" ]; then
|
||||
@@ -316,8 +420,8 @@ start_service() {
|
||||
json_close_object
|
||||
|
||||
json_add_string "temp_dir" "$temp_dir"
|
||||
json_add_string "bleve_dir" "$data_dir/bleve"
|
||||
json_add_string "dist_dir" ""
|
||||
json_add_string "bleve_dir" "$bleve_dir"
|
||||
json_add_string "dist_dir" "$dist_dir"
|
||||
|
||||
# log
|
||||
json_add_object "log"
|
||||
@@ -363,7 +467,7 @@ start_service() {
|
||||
json_add_object "upload"
|
||||
json_add_int "workers" "$upload_workers"
|
||||
json_add_int "max_retry" "$upload_max_retry"
|
||||
json_add_boolean "task_persistant" "$upload_task_persistant"
|
||||
json_add_boolean "task_persistant" 0
|
||||
json_close_object
|
||||
json_add_object "copy"
|
||||
json_add_int "workers" "$copy_workers"
|
||||
@@ -383,7 +487,7 @@ start_service() {
|
||||
json_add_object "decompress_upload"
|
||||
json_add_int "workers" "$decompress_upload_workers"
|
||||
json_add_int "max_retry" "$decompress_upload_max_retry"
|
||||
json_add_boolean "task_persistant" "$decompress_upload_task_persistant"
|
||||
json_add_boolean "task_persistant" 0
|
||||
json_close_object
|
||||
json_add_boolean "allow_retry_canceled" "$allow_retry_canceled"
|
||||
json_close_object
|
||||
@@ -430,7 +534,8 @@ start_service() {
|
||||
json_add_string "last_launched_version" "$last_launched_version"
|
||||
json_add_string "proxy_address" "$proxy_address"
|
||||
|
||||
json_dump > "$data_dir/config.json"
|
||||
write_config || { openlist2_error "Unable to atomically save config.json; service was not started."; return 1; }
|
||||
set_firewall || return 1
|
||||
|
||||
procd_open_instance openlist2
|
||||
procd_set_param env OPENLIST_ADMIN_PASSWORD=admin
|
||||
@@ -439,7 +544,8 @@ start_service() {
|
||||
procd_append_param command --data "$data_dir"
|
||||
procd_append_param command --no-prefix
|
||||
[ "$debug" = "1" ] && procd_append_param command --debug
|
||||
[ "$debug" = "1" ] && procd_set_param stderr 1
|
||||
procd_set_param stderr 1
|
||||
[ "$debug" = "1" ] && procd_set_param stdout 1
|
||||
procd_set_param respawn
|
||||
procd_set_param limits core="unlimited"
|
||||
procd_set_param limits nofile="200000 200000"
|
||||
@@ -453,7 +559,6 @@ service_triggers() {
|
||||
reload_service() {
|
||||
stop
|
||||
start
|
||||
return 0
|
||||
}
|
||||
|
||||
stop_service() {
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
Subject: Retire the obsolete OpenWrt polyfill shim without changing custom HTML
|
||||
|
||||
--- a/internal/bootstrap/data/setting.go
|
||||
+++ b/internal/bootstrap/data/setting.go
|
||||
@@ -70,6 +70,11 @@ func initSettings() {
|
||||
continue
|
||||
}
|
||||
}
|
||||
+ // Retire only the exact polyfill shim shipped by old OpenWrt packages.
|
||||
+ if item.Key == conf.CustomizeHead && stored != nil &&
|
||||
+ stored.Value == "<script src=\"/assets/polyfill.min.js?features=String.prototype.replaceAll\"></script>" {
|
||||
+ migrationValue = stored.Value
|
||||
+ }
|
||||
if item.Key != conf.VERSION && stored != nil &&
|
||||
(len(migrationValue) == 0 || stored.Value != migrationValue) {
|
||||
item.Value = stored.Value
|
||||
Reference in new issue
Block a user