From 8ac8f041286a3b3d6754fa54bfb806e46d29245e7a51acccd2f824d3b586defe Mon Sep 17 00:00:00 2001 From: AidarKC Date: Sat, 21 Nov 2026 01:10:13 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20=D0=BE=D0=BA=D1=80=D1=83=D0=B6=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20t2=20=D0=BF=D1=80=D0=B8=20deploy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy/scripts/test_t2_server.sh | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/deploy/scripts/test_t2_server.sh b/deploy/scripts/test_t2_server.sh index 408b96a4..61fdeda4 100755 --- a/deploy/scripts/test_t2_server.sh +++ b/deploy/scripts/test_t2_server.sh @@ -1,11 +1,27 @@ #!/usr/bin/env bash set -euo pipefail -REMOTE_HOST="player@t2.shineup.me" \ -TARGET_DOMAIN="t2.shineup.me" \ -REMOTE_SERVER_DIR="/home/player/t2/server" \ -REMOTE_DM_FILES_DIR="/home/player/test-dm-files" \ -REMOTE_PUBLIC_FILES_DIR="/home/player/test-public-files" \ -REMOTE_SERVICE_NAME="shine-t2" \ -SERVER_PORT="7102" \ -bash "$(dirname "$0")/deploy_server.sh" +# t2.shineup.me использует /etc/shine/shine-t2.env. Не вызываем +# deploy_server.sh: тот пересоздаёт unit без EnvironmentFile. +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +ROOT_DIR="$(cd "$SCRIPT_DIR/../.." && pwd)" +REMOTE_HOST="player@t2.shineup.me" +REMOTE_SERVER_DIR="/home/player/t2/server" +REMOTE_SERVICE_NAME="shine-t2" +LOCAL_JAR="$ROOT_DIR/SHiNE-server/build/libs/shine-server.jar" + +echo "==> Building server jar" +(cd "$ROOT_DIR" && ./gradlew shadowJar) + +if [[ ! -s "$LOCAL_JAR" ]]; then + echo "ERROR: server jar not found: $LOCAL_JAR" >&2 + exit 1 +fi + +echo "==> Deploy server to t2.shineup.me ($REMOTE_HOST)" +ssh -o BatchMode=yes -o ConnectTimeout=20 "$REMOTE_HOST" "echo SSH OK" >/dev/null +rsync -az --timeout=120 "$LOCAL_JAR" "$ROOT_DIR/allowed-email-domains.txt" \ + "$REMOTE_HOST:$REMOTE_SERVER_DIR/" +ssh "$REMOTE_HOST" "sudo systemctl restart '$REMOTE_SERVICE_NAME'; sudo systemctl --no-pager --full status '$REMOTE_SERVICE_NAME'" + +echo "Всё хорошо: сервер t2.shineup.me обновлён и сервис $REMOTE_SERVICE_NAME перезапущен"