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 перезапущен"