Исправить устойчивость UI-деплоя и проверку Caddy

deploy_shine-PWA.sh

@@ -3,7 +3,9 @@ set -euo pipefail
 
 SRC_DIR="shine-UI"
 REMOTE_HOST="${REMOTE_HOST:-player@93.170.12.154}"
-REMOTE_BASE_DIR="${REMOTE_BASE_DIR:-/home/player/SHiNE}"
+REMOTE_UI_DIR="${REMOTE_UI_DIR:-/home/player/SHiNE/SHiNE-UI}"
+EXPECTED_CADDY_UI_ROOT="${EXPECTED_CADDY_UI_ROOT:-/home/player/SHiNE/SHiNE-UI}"
+ALLOW_CADDY_MISMATCH="${ALLOW_CADDY_MISMATCH:-0}"
 BUILD_VERSION="$(date -u +%Y%m%d%H%M%S)"
 VERSION_FILE="VERSION.properties"
 export BUILD_VERSION
@@ -21,9 +23,8 @@ if [[ -z "$CLIENT_VERSION" ]]; then
 fi
 export CLIENT_VERSION
 
-TARGET_DIR="SHiNE-UI"
 TARGET_URL="https://shineup.me"
-REMOTE_DIR="${REMOTE_BASE_DIR}/${TARGET_DIR}"
+REMOTE_DIR="${REMOTE_UI_DIR}"
 
 cleanup() {
   rm -rf "$TMP_DIR"
@@ -37,7 +38,7 @@ fi
 
 echo "==> Preparing staged UI copy with build version: $BUILD_VERSION"
 echo "==> Client version from $VERSION_FILE: $CLIENT_VERSION"
-echo "==> Deploy target: $TARGET_URL ($TARGET_DIR)"
+echo "==> Deploy target: $TARGET_URL ($REMOTE_DIR)"
 rsync -a "$SRC_DIR"/ "$TMP_DIR"/
 
 INDEX_FILE="$TMP_DIR/index.html"
@@ -52,6 +53,18 @@ perl -0pi -e 's/window\.__SHINE_CLIENT_VERSION__\s*=\s*'\''[^'\'']*'\'';/window.
 echo "==> Checking SSH connectivity to $REMOTE_HOST"
 ssh -o BatchMode=yes -o ConnectTimeout=10 "$REMOTE_HOST" "echo SSH OK" >/dev/null
 
+echo "==> Validating Caddy UI root"
+CADDY_ROOT_LINE="$(ssh "$REMOTE_HOST" "sudo grep -n 'root \\* ' /etc/caddy/Caddyfile | head -n 1 || true")"
+if [[ -n "$CADDY_ROOT_LINE" && "$CADDY_ROOT_LINE" != *"$EXPECTED_CADDY_UI_ROOT"* ]]; then
+  echo "ERROR: Caddy root mismatch. Found: $CADDY_ROOT_LINE" >&2
+  echo "Expected path fragment: $EXPECTED_CADDY_UI_ROOT" >&2
+  if [[ "$ALLOW_CADDY_MISMATCH" != "1" ]]; then
+    echo "Set ALLOW_CADDY_MISMATCH=1 to bypass this check." >&2
+    exit 1
+  fi
+  echo "WARN: proceeding due to ALLOW_CADDY_MISMATCH=1"
+fi
+
 echo "==> Preparing remote directory: $REMOTE_DIR"
 ssh "$REMOTE_HOST" "mkdir -p '$REMOTE_DIR'"