Удалены демо данные и подключен рабочий API BotFactory v2.2
Этот коммит содержится в:
@@ -1,11 +1,13 @@
|
||||
#!/usr/bin/env bash
|
||||
# BotFactory v2.1.1 — emergency repair for nginx 500 + service diagnostics
|
||||
# BotFactory v2.2.0 — repair/update script for real API + frontend + bots
|
||||
set -euo pipefail
|
||||
|
||||
APP_DIR="/opt/botfactory"
|
||||
SRC_DIR="/opt/botfactory-src"
|
||||
APP_USER="botfactory"
|
||||
FRONT_DIR="${APP_DIR}/frontend"
|
||||
BACK_DIR="${APP_DIR}/backend"
|
||||
VENV="${APP_DIR}/venv"
|
||||
API_PORT="8000"
|
||||
|
||||
ok(){ echo -e "\033[0;32m[✓]\033[0m $*"; }
|
||||
@@ -15,53 +17,103 @@ err(){ echo -e "\033[0;31m[✗]\033[0m $*"; }
|
||||
[[ $EUID -eq 0 ]] || { err "Запустите от root: sudo bash scripts/repair_server.sh"; exit 1; }
|
||||
[[ -d "$APP_DIR" ]] || { err "Нет ${APP_DIR}. Сначала установите BotFactory."; exit 1; }
|
||||
|
||||
mkdir -p "${APP_DIR}/logs" "${APP_DIR}/uploads" "${APP_DIR}/backups"
|
||||
|
||||
if id "$APP_USER" >/dev/null 2>&1; then
|
||||
chown -R "${APP_USER}:${APP_USER}" "$APP_DIR"
|
||||
else
|
||||
warn "Пользователь ${APP_USER} не найден"
|
||||
fi
|
||||
|
||||
# Важно: nginx должен пройти по /opt/botfactory и читать frontend/dist.
|
||||
chmod 755 /opt || true
|
||||
chmod 755 "$APP_DIR"
|
||||
chmod 755 "${APP_DIR}/frontend" 2>/dev/null || true
|
||||
chmod 755 "${APP_DIR}/frontend/dist" 2>/dev/null || true
|
||||
find "${APP_DIR}/frontend/dist" -type d -exec chmod 755 {} \; 2>/dev/null || true
|
||||
find "${APP_DIR}/frontend/dist" -type f -exec chmod 644 {} \; 2>/dev/null || true
|
||||
chmod 755 "${APP_DIR}/backend" 2>/dev/null || true
|
||||
find "${APP_DIR}/backend" -type d -exec chmod 755 {} \; 2>/dev/null || true
|
||||
find "${APP_DIR}/backend" -type f -name '*.py' -exec chmod 644 {} \; 2>/dev/null || true
|
||||
chmod 770 "${APP_DIR}/logs" "${APP_DIR}/uploads" "${APP_DIR}/backups" 2>/dev/null || true
|
||||
[[ -f "${APP_DIR}/.env" ]] && chmod 600 "${APP_DIR}/.env"
|
||||
ok "Права исправлены"
|
||||
mkdir -p "${APP_DIR}/logs" "${APP_DIR}/uploads" "${APP_DIR}/backups" "$BACK_DIR" "$FRONT_DIR"
|
||||
|
||||
if [[ -d "$SRC_DIR" ]]; then
|
||||
if [[ -d "$SRC_DIR/backend" ]]; then
|
||||
rsync -a --delete "${SRC_DIR}/backend/" "${APP_DIR}/backend/"
|
||||
rsync -a --delete "${SRC_DIR}/backend/" "${BACK_DIR}/"
|
||||
ok "Backend синхронизирован из ${SRC_DIR}"
|
||||
fi
|
||||
if [[ -d "$SRC_DIR/frontend" ]]; then
|
||||
rsync -a --delete "${SRC_DIR}/frontend/" "${APP_DIR}/frontend/"
|
||||
rsync -a --delete "${SRC_DIR}/frontend/" "${FRONT_DIR}/"
|
||||
ok "Frontend синхронизирован из ${SRC_DIR}"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ -f "${APP_DIR}/backend/requirements.txt" && -x "${APP_DIR}/venv/bin/pip" ]]; then
|
||||
"${APP_DIR}/venv/bin/pip" install -q -r "${APP_DIR}/backend/requirements.txt"
|
||||
if ! id "$APP_USER" >/dev/null 2>&1; then
|
||||
useradd --system --home "$APP_DIR" --shell /usr/sbin/nologin "$APP_USER"
|
||||
fi
|
||||
|
||||
chown -R "${APP_USER}:${APP_USER}" "$APP_DIR"
|
||||
chmod 755 /opt || true
|
||||
chmod 755 "$APP_DIR" "$BACK_DIR" "$FRONT_DIR" 2>/dev/null || true
|
||||
find "$BACK_DIR" -type d -exec chmod 755 {} \; 2>/dev/null || true
|
||||
find "$BACK_DIR" -type f -name '*.py' -exec chmod 644 {} \; 2>/dev/null || true
|
||||
chmod 770 "${APP_DIR}/logs" "${APP_DIR}/uploads" "${APP_DIR}/backups" 2>/dev/null || true
|
||||
[[ -f "${APP_DIR}/.env" ]] && { chown "${APP_USER}:${APP_USER}" "${APP_DIR}/.env"; chmod 600 "${APP_DIR}/.env"; }
|
||||
ok "Права исправлены"
|
||||
|
||||
if [[ -f "${BACK_DIR}/requirements.txt" && -x "${VENV}/bin/pip" ]]; then
|
||||
sudo -u "$APP_USER" "${VENV}/bin/pip" install -q -r "${BACK_DIR}/requirements.txt"
|
||||
ok "Python-зависимости проверены"
|
||||
fi
|
||||
|
||||
if [[ -f "${APP_DIR}/frontend/package.json" ]]; then
|
||||
npm install --prefix "${APP_DIR}/frontend" --silent --no-fund --no-audit
|
||||
npm run build --prefix "${APP_DIR}/frontend" --silent
|
||||
[[ -f "${APP_DIR}/frontend/dist/index.html" ]] || { err "Frontend build failed: нет dist/index.html"; exit 1; }
|
||||
find "${APP_DIR}/frontend/dist" -type d -exec chmod 755 {} \;
|
||||
find "${APP_DIR}/frontend/dist" -type f -exec chmod 644 {} \;
|
||||
if [[ -f "${FRONT_DIR}/package.json" ]]; then
|
||||
npm install --prefix "${FRONT_DIR}" --silent --no-fund --no-audit
|
||||
npm run build --prefix "${FRONT_DIR}" --silent
|
||||
[[ -f "${FRONT_DIR}/dist/index.html" ]] || { err "Frontend build failed: нет dist/index.html"; exit 1; }
|
||||
chown -R "${APP_USER}:${APP_USER}" "${FRONT_DIR}"
|
||||
chmod 755 "${FRONT_DIR}" "${FRONT_DIR}/dist"
|
||||
find "${FRONT_DIR}/dist" -type d -exec chmod 755 {} \;
|
||||
find "${FRONT_DIR}/dist" -type f -exec chmod 644 {} \;
|
||||
ok "Frontend пересобран"
|
||||
fi
|
||||
|
||||
cat > /etc/systemd/system/botfactory-api.service <<SERVICE
|
||||
[Unit]
|
||||
Description=BotFactory API (FastAPI)
|
||||
After=network.target postgresql.service redis-server.service
|
||||
Requires=postgresql.service redis-server.service
|
||||
StartLimitIntervalSec=60
|
||||
StartLimitBurst=5
|
||||
|
||||
[Service]
|
||||
Type=exec
|
||||
User=${APP_USER}
|
||||
Group=${APP_USER}
|
||||
WorkingDirectory=${BACK_DIR}
|
||||
Environment=PYTHONPATH=${BACK_DIR}
|
||||
EnvironmentFile=${APP_DIR}/.env
|
||||
ExecStart=${VENV}/bin/uvicorn main:app --host 127.0.0.1 --port ${API_PORT} --workers 1 --loop uvloop --log-level info
|
||||
Restart=always
|
||||
RestartSec=5
|
||||
TimeoutStopSec=20
|
||||
KillMode=mixed
|
||||
StandardOutput=append:${APP_DIR}/logs/api.log
|
||||
StandardError=append:${APP_DIR}/logs/api-error.log
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
SERVICE
|
||||
|
||||
cat > /etc/systemd/system/botfactory-bots.service <<SERVICE
|
||||
[Unit]
|
||||
Description=BotFactory Bots Runner (platform + shops)
|
||||
After=network-online.target postgresql.service redis-server.service
|
||||
Wants=network-online.target postgresql.service redis-server.service
|
||||
StartLimitIntervalSec=60
|
||||
StartLimitBurst=5
|
||||
|
||||
[Service]
|
||||
Type=exec
|
||||
User=${APP_USER}
|
||||
Group=${APP_USER}
|
||||
WorkingDirectory=${BACK_DIR}
|
||||
Environment=PYTHONPATH=${BACK_DIR}
|
||||
EnvironmentFile=${APP_DIR}/.env
|
||||
ExecStart=${VENV}/bin/python shop_bots_runner.py
|
||||
Restart=always
|
||||
RestartSec=10
|
||||
TimeoutStopSec=20
|
||||
KillMode=mixed
|
||||
StandardOutput=append:${APP_DIR}/logs/bots.log
|
||||
StandardError=append:${APP_DIR}/logs/bots-error.log
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
SERVICE
|
||||
ok "systemd service-файлы обновлены"
|
||||
|
||||
if [[ -f /etc/nginx/sites-available/botfactory ]]; then
|
||||
nginx -t
|
||||
systemctl reload nginx || systemctl restart nginx
|
||||
@@ -71,6 +123,7 @@ else
|
||||
fi
|
||||
|
||||
systemctl daemon-reload
|
||||
systemctl enable botfactory-api botfactory-bots >/dev/null 2>&1 || true
|
||||
systemctl restart botfactory-api || true
|
||||
sleep 2
|
||||
systemctl restart botfactory-bots || true
|
||||
@@ -87,8 +140,6 @@ echo
|
||||
curl -sS -I "http://127.0.0.1/" || true
|
||||
|
||||
echo
|
||||
warn "Если бот не стартует, сразу пришлите вывод команд:"
|
||||
echo "journalctl -u botfactory-bots -n 120 --no-pager"
|
||||
echo "journalctl -u botfactory-api -n 120 --no-pager"
|
||||
echo "tail -n 120 ${APP_DIR}/logs/bots-error.log"
|
||||
echo "tail -n 120 ${APP_DIR}/logs/api-error.log"
|
||||
warn "Если бот молчит, пришлите вывод:"
|
||||
echo "journalctl -u botfactory-bots -n 160 --no-pager"
|
||||
echo "tail -n 160 ${APP_DIR}/logs/bots-error.log"
|
||||
|
||||
Ссылка в новой задаче
Block a user
© 2026 StackWorks