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

+4 -4
View File
@@ -145,7 +145,7 @@ password: admin
<h3> VPS: поставить Hub, Xray, firewall и HTTPS одной командой</h3> <h3> VPS: поставить Hub, Xray, firewall и HTTPS одной командой</h3>
```sh ```sh
curl -fsSL "https://raw.githubusercontent.com/kzolotarev95/luci-app-owrt-remote/main/vps/install-vps.sh?v=$(date +%s)" | sudo sh curl -fsSL "https://gitlab.com/kzolotarev95/luci-app-owrt-remote/-/raw/main/vps/install-vps.sh?v=$(date +%s)" | sudo sh
``` ```
Установщик спросит: Установщик спросит:
@@ -165,7 +165,7 @@ hub.example.com
<h3> OpenWrt: поставить Remote Hub на роутер</h3> <h3> OpenWrt: поставить Remote Hub на роутер</h3>
```sh ```sh
wget -O - "https://raw.githubusercontent.com/kzolotarev95/luci-app-owrt-remote/main/install.sh?v=$(date +%s)" | sh wget -O - "https://gitlab.com/kzolotarev95/luci-app-owrt-remote/-/raw/main/install.sh?v=$(date +%s)" | sh
``` ```
Проверка на роутере: Проверка на роутере:
@@ -426,7 +426,7 @@ flowchart LR
</div> </div>
```sh ```sh
curl -fsSL "https://raw.githubusercontent.com/kzolotarev95/luci-app-owrt-remote/main/vps/install-vps.sh?v=$(date +%s)" | sudo env RESET_LOGIN=0 sh curl -fsSL "https://gitlab.com/kzolotarev95/luci-app-owrt-remote/-/raw/main/vps/install-vps.sh?v=$(date +%s)" | sudo env RESET_LOGIN=0 sh
``` ```
<div align="center"> <div align="center">
@@ -436,7 +436,7 @@ curl -fsSL "https://raw.githubusercontent.com/kzolotarev95/luci-app-owrt-remote/
</div> </div>
```sh ```sh
curl -fsSL "https://raw.githubusercontent.com/kzolotarev95/luci-app-owrt-remote/main/vps/enable-https.sh?v=$(date +%s)" | sudo sh -s -- YOUR_VPS_IP curl -fsSL "https://gitlab.com/kzolotarev95/luci-app-owrt-remote/-/raw/main/vps/enable-https.sh?v=$(date +%s)" | sudo sh -s -- YOUR_VPS_IP
``` ```
</details> </details>
+1 -1
View File
@@ -4,7 +4,7 @@ set -eu
export PATH="/bin:/sbin:/usr/bin:/usr/sbin:${PATH:-}" export PATH="/bin:/sbin:/usr/bin:/usr/sbin:${PATH:-}"
RAW_URL="${RAW_URL:-https://raw.githubusercontent.com/kzolotarev95/luci-app-owrt-remote/main}" RAW_URL="${RAW_URL:-https://gitlab.com/kzolotarev95/luci-app-owrt-remote/-/raw/main}"
ROOT="${ROOT:-/}" ROOT="${ROOT:-/}"
SCRIPT_DIR="$(CDPATH= cd "$(dirname "$0")" 2>/dev/null && pwd)" SCRIPT_DIR="$(CDPATH= cd "$(dirname "$0")" 2>/dev/null && pwd)"
+2 -2
View File
@@ -3,7 +3,7 @@ set -u
APP_NAME="OpenWrt Remote Hub" APP_NAME="OpenWrt Remote Hub"
INSTALLER_VERSION="2026-08-17-https-bootstrap-v1" 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}" 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}" STATE_DIR="${OWRT_REMOTE_STATE_DIR:-/var/lib/owrt-remote}"
HUB_LOGIN="${HUB_LOGIN:-admin}" HUB_LOGIN="${HUB_LOGIN:-admin}"
@@ -273,7 +273,7 @@ print_result() {
if [ "${HTTPS_OK:-0}" != "1" ]; then if [ "${HTTPS_OK:-0}" != "1" ]; then
info "" info ""
info "Включить HTTPS вручную:" 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 fi
info "============================================================" info "============================================================"
} }