From 112de1bb2748c67c04d649bf70993476d4e18bc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80?= <78488229+viktor138irk@users.noreply.github.com> Date: Thu, 7 May 2026 10:21:02 +0900 Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=B0=D0=BD=D0=BE=D0=BD=D0=B8=D1=87?= =?UTF-8?q?=D0=B5=D1=81=D0=BA=D0=B8=D0=B5=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=BF=D0=B0=D0=BD=D0=B5=D0=BB=D0=B8=20=D0=B1?= =?UTF-8?q?=D1=8B=D0=BB=D0=B8=20=D0=B7=D0=B0=D0=BA=D1=80=D0=B5=D0=BF=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20=D0=BF?= =?UTF-8?q?=D0=B0=D1=82=D1=87=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/install_web_panel.sh | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/scripts/install_web_panel.sh b/scripts/install_web_panel.sh index 5d8b373..453af94 100644 --- a/scripts/install_web_panel.sh +++ b/scripts/install_web_panel.sh @@ -75,6 +75,16 @@ run_logged() { fi } +restore_canonical_templates() { + local templates=("_sidebar.html" "dashboard.html" "vm_create.html" "vm_detail.html" "iso.html" "disk_images.html" "operations.html" "operation_detail.html" "host.html" "network.html" "logs.html" "update.html") + local name="" + for name in "${templates[@]}"; do + if [[ -f "${WEB_DIR}/templates/${name}" ]]; then + cp "${WEB_DIR}/templates/${name}" "${APP_DIR}/templates/${name}" + fi + done +} + service_state() { systemctl is-active "$1" 2>/dev/null || echo "inactive"; } require_root() { [[ "$EUID" -eq 0 ]] || fail "Запусти через sudo: sudo bash scripts/install_web_panel.sh"; } json_value() { python3 -c 'import json,sys; print(json.load(open(sys.argv[1])).get(sys.argv[2], ""))' "$PROFILE_FILE" "$1" 2>/dev/null || true; } @@ -207,11 +217,7 @@ if [[ -f "${REPO_DIR}/scripts/patch_remove_legacy_boot_order_card.py" ]]; then else warn "patch_remove_legacy_boot_order_card.py не найден, удаление старого блока порядка загрузки пропущено" fi -if [[ -f "${WEB_DIR}/templates/vm_detail.html" ]]; then - run_logged "Канонический шаблон карточки VM восстановлен после патчей" cp "${WEB_DIR}/templates/vm_detail.html" "${APP_DIR}/templates/vm_detail.html" -else - warn "Канонический vm_detail.html не найден, финальное восстановление карточки VM пропущено" -fi +run_logged "Канонические шаблоны панели восстановлены после VM-патчей" restore_canonical_templates if [[ -f "${REPO_DIR}/scripts/patch_disk_archives.py" ]]; then run_logged "disk archive import patch применён" python3 "${REPO_DIR}/scripts/patch_disk_archives.py" "${APP_DIR}/app.py" else @@ -262,9 +268,7 @@ if [[ -f "${REPO_DIR}/scripts/patch_vm_autostart.py" ]]; then else warn "patch_vm_autostart.py не найден, нормализация автозапуска VM пропущена" fi -if [[ -f "${WEB_DIR}/templates/vm_detail.html" ]]; then - run_logged "Канонический шаблон карточки VM финально восстановлен" cp "${WEB_DIR}/templates/vm_detail.html" "${APP_DIR}/templates/vm_detail.html" -fi +run_logged "Канонические шаблоны панели финально восстановлены" restore_canonical_templates run_logged "Конфиг профиля доступен web-панели" mkdir -p "$PROFILE_DIR" if [[ -f "$PROFILE_FILE" ]]; then ok "Профиль уже сохранён: $PROFILE_FILE"