Merge branch 'refactor'

This commit is contained in:
@kirill.komarov
2026-05-13 22:07:46 +05:00
parent 3c9797af4a
commit a06f9cf2c4
85 changed files with 3762 additions and 2072 deletions
+18 -2
View File
@@ -115,9 +115,10 @@ build_rsync_rsh() {
deploy_backend() {
remote_exec mkdir -p "$DEPLOY_PATH/server"
remote_exec mkdir -p "$DEPLOY_PATH/shared"
if should_use_tar_transport; then
echo ">>> Бэкенд: tar|ssh → $REMOTE:$DEPLOY_PATH/server/"
echo ">>> Бэкенд (server): tar|ssh → $REMOTE:$DEPLOY_PATH/server/"
if [[ -n "$DRY_RUN" ]]; then
echo "(dry-run) без передачи tar"
else
@@ -132,9 +133,17 @@ deploy_backend() {
--exclude=.dev_env \
.
) | "${SSH_BASE[@]}" "mkdir -p ${DEPLOY_PATH}/server && tar xzf - -C ${DEPLOY_PATH}/server"
echo ">>> Бэкенд (shared): tar|ssh → $REMOTE:$DEPLOY_PATH/shared/"
(
cd "$ROOT/shared" || exit 1
tar -czf - \
--exclude=.git \
.
) | "${SSH_BASE[@]}" "mkdir -p ${DEPLOY_PATH}/shared && tar xzf - -C ${DEPLOY_PATH}/shared"
fi
else
echo ">>> Бэкенд: rsync → $REMOTE:$DEPLOY_PATH/server/"
echo ">>> Бэкенд (server): rsync → $REMOTE:$DEPLOY_PATH/server/"
local rsh
rsh="$(build_rsync_rsh)"
@@ -147,6 +156,12 @@ deploy_backend() {
--exclude .env \
--exclude .dev_env \
"${ROOT}/server/" "${REMOTE}:${DEPLOY_PATH}/server/"
echo ">>> Бэкенд (shared): rsync → $REMOTE:$DEPLOY_PATH/shared/"
rsync "${RSYNC_OPTS[@]}" \
-e "$rsh" \
--exclude .git \
"${ROOT}/shared/" "${REMOTE}:${DEPLOY_PATH}/shared/"
fi
if [[ -n "$DRY_RUN" ]]; then
@@ -164,6 +179,7 @@ deploy_backend() {
if [[ "${DEPLOY_USER}" == "root" && "${DEPLOY_SKIP_CHOWN}" != "1" ]]; then
echo ">>> Права на серверный каталог: chown ${DEPLOY_SERVER_OWNER} (деплой от root)"
remote_exec chown -R "${DEPLOY_SERVER_OWNER}:${DEPLOY_SERVER_OWNER}" "$DEPLOY_PATH/server"
remote_exec chown -R "${DEPLOY_SERVER_OWNER}:${DEPLOY_SERVER_OWNER}" "$DEPLOY_PATH/shared"
fi
if [[ -n "${DEPLOY_RESTART_CMD}" ]]; then
echo ">>> Рестарт: $DEPLOY_RESTART_CMD"