Merge remote-tracking branch 'gitlab/main'

# Conflicts:
#	files/www/cgi-bin/owrt-remote
#	files/www/luci-static/resources/view/owrt_remote.js
#	tests/RESOURCE_AUDIT.md
#	tests/test_resource_lifecycle.py
#	vps/deploy-resource-fix.ps1
#	vps/owrt-remote-hub.py
This commit is contained in:
kzolotarev95 committed 2026-10-07 15:08:40 +04:00
commit 411f95d6ba
3 files changed
+7 -7

No files matched your search

+2 -2
View File
@@ -3,7 +3,7 @@ set -u
APP_NAME="OpenWrt Remote Hub"
INSTALLER_VERSION="2026-08-17-https-bootstrap-v1"
RAW_BASE="${RAW_URL:-https://raw.githubusercontent.com/kzolotarev95/luci-app-owrt-remote/main}"
RAW_BASE="${RAW_URL:-https://gitlab.com/kzolotarev95/luci-app-owrt-remote/-/raw/main}"
XRAY_INSTALL_SCRIPT_URL="${XRAY_INSTALL_SCRIPT_URL:-https://github.com/XTLS/Xray-install/raw/main/install-release.sh}"
STATE_DIR="${OWRT_REMOTE_STATE_DIR:-/var/lib/owrt-remote}"
HUB_LOGIN="${HUB_LOGIN:-admin}"
@@ -273,7 +273,7 @@ print_result() {
if [ "${HTTPS_OK:-0}" != "1" ]; then
info ""
info "Включить HTTPS вручную:"
info ' curl -fsSL "https://raw.githubusercontent.com/kzolotarev95/luci-app-owrt-remote/main/vps/enable-https.sh?v=$(date +%s)" | sudo sh -s -- '"$host"
info ' curl -fsSL "https://gitlab.com/kzolotarev95/luci-app-owrt-remote/-/raw/main/vps/enable-https.sh?v=$(date +%s)" | sudo sh -s -- '"$host"
fi
info "============================================================"
}