fix: быстрое развёртывание — PGDG, /opt/shop/shop10, без placeholder URL

Co-authored-by: Cursor <cursoragent@cursor.com>

scripts/fix-db-connection.sh

@@ -2,29 +2,30 @@
 # Быстрое исправление ECONNREFUSED 127.0.0.1:5432
 set -euo pipefail
 
-source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/shop-root.sh"
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/shop-root.sh"
 
-echo "=== Исправление подключения к PostgreSQL ==="
+echo "=== Исправление подключения к PostgreSQL ($SHOP_ROOT) ==="
 
-if ! dpkg -l | grep -q postgresql; then
-  echo "Установка PostgreSQL 17..."
-  apt update
-  apt install -y postgresql-17 postgresql-client-17 || {
-    echo "Если пакет не найден — см. README (репозиторий PGDG)"
-    exit 1
-  }
+if ! command -v psql >/dev/null; then
+  bash "$SCRIPT_DIR/install-postgresql-ubuntu.sh"
 fi
 
-bash scripts/setup-postgres-ubuntu.sh
+bash "$SCRIPT_DIR/setup-postgres-ubuntu.sh"
 
 if [ -f .env ] && ! grep -q '^DATABASE_URL=' .env; then
-  echo "DATABASE_URL=postgresql://shop:shop@127.0.0.1:5432/shop" >> .env
+  echo 'DATABASE_URL=postgresql://shop:shop@127.0.0.1:5432/shop' >> .env
   echo "Добавлен DATABASE_URL в .env"
 fi
 
-cp -f deploy/shop.service /etc/systemd/system/shop.service
-systemctl daemon-reload
-systemctl restart shop
+if [ -f deploy/shop.service ]; then
+  cp -f deploy/shop.service /etc/systemd/system/shop.service
+  sed -i "s|WorkingDirectory=.*|WorkingDirectory=${SHOP_ROOT}|" /etc/systemd/system/shop.service
+  sed -i "s|EnvironmentFile=.*|EnvironmentFile=${SHOP_ROOT}/.env|" /etc/systemd/system/shop.service
+  systemctl daemon-reload
+fi
+
+systemctl restart shop 2>/dev/null || true
 sleep 2
 
 if curl -sf http://127.0.0.1:3000/health; then

scripts/install-postgresql-ubuntu.sh

@@ -0,0 +1,59 @@
+#!/bin/bash
+# Установка PostgreSQL 17 (PGDG) или postgresql из Ubuntu
+# sudo bash scripts/install-postgresql-ubuntu.sh
+set -euo pipefail
+
+if command -v psql >/dev/null; then
+  echo "PostgreSQL уже установлен: $(psql --version | head -1)"
+  systemctl enable postgresql 2>/dev/null || true
+  systemctl start postgresql 2>/dev/null || true
+  exit 0
+fi
+
+echo "=== Установка PostgreSQL ==="
+apt update
+apt install -y curl ca-certificates gnupg lsb-release
+
+if [ ! -f /etc/os-release ]; then
+  echo "Ошибка: не найден /etc/os-release"
+  exit 1
+fi
+# shellcheck source=/dev/null
+. /etc/os-release
+CODENAME="${VERSION_CODENAME:-}"
+if [ -z "$CODENAME" ]; then
+  echo "Ошибка: не удалось определить VERSION_CODENAME (Ubuntu/Debian?)"
+  exit 1
+fi
+
+install -d /usr/share/postgresql-common/pgdg
+curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc \
+  -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc
+
+echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt ${CODENAME}-pgdg main" \
+  > /etc/apt/sources.list.d/pgdg.list
+
+apt update
+
+if apt install -y postgresql-17 postgresql-client-17; then
+  echo "Установлен PostgreSQL 17 (PGDG)"
+else
+  echo "Пакет postgresql-17 недоступен — устанавливаем postgresql из репозитория Ubuntu..."
+  apt install -y postgresql postgresql-contrib
+fi
+
+systemctl enable postgresql
+systemctl start postgresql
+
+for i in $(seq 1 30); do
+  if pg_isready -h 127.0.0.1 -p 5432 -q 2>/dev/null; then
+    echo "pg_isready: OK"
+    psql --version | head -1
+    exit 0
+  fi
+  sleep 1
+done
+
+echo "PostgreSQL установлен, но не отвечает на 127.0.0.1:5432"
+echo "  journalctl -u postgresql -n 30 --no-pager"
+exit 1

scripts/quick-deploy-ubuntu.sh

@@ -0,0 +1,73 @@
+#!/bin/bash
+# Быстрое развёртывание / обновление на Ubuntu (без Docker)
+# sudo bash scripts/quick-deploy-ubuntu.sh
+#
+# Каталог по умолчанию: /opt/shop/shop10
+# Переопределение: SHOP_INSTALL_DIR=/opt/shop/shop10 SHOP_GIT_URL=https://...
+set -euo pipefail
+
+INSTALL_DIR="${SHOP_INSTALL_DIR:-/opt/shop/shop10}"
+GIT_URL="${SHOP_GIT_URL:-https://git.evilfox.cc/test/shop10.git}"
+
+if [ "$(id -u)" -ne 0 ]; then
+  echo "Запустите от root: sudo bash scripts/quick-deploy-ubuntu.sh"
+  exit 1
+fi
+
+echo "=== Shop: быстрое развёртывание ==="
+echo "Каталог: $INSTALL_DIR"
+
+if ! command -v node >/dev/null; then
+  echo "Установка Node.js 20..."
+  apt update
+  apt install -y git curl ca-certificates
+  curl -fsSL https://deb.nodesource.com/setup_20.x | bash -
+  apt install -y nodejs
+fi
+
+if [ ! -f "$INSTALL_DIR/package.json" ]; then
+  echo "Клонирование репозитория..."
+  mkdir -p "$(dirname "$INSTALL_DIR")"
+  git clone "$GIT_URL" "$INSTALL_DIR"
+fi
+
+export SHOP_ROOT="$INSTALL_DIR"
+cd "$INSTALL_DIR"
+git config --global --add safe.directory "$INSTALL_DIR" 2>/dev/null || true
+git pull
+
+bash scripts/install-postgresql-ubuntu.sh
+bash scripts/setup-postgres-ubuntu.sh
+
+if [ ! -f .env ]; then
+  cp .env.example .env
+  if command -v openssl >/dev/null; then
+    SECRET=$(openssl rand -hex 32)
+    sed -i "s/change-me-to-a-long-random-string/${SECRET}/" .env
+  fi
+  if ! grep -q '^DATABASE_URL=' .env; then
+    echo 'DATABASE_URL=postgresql://shop:shop@127.0.0.1:5432/shop' >> .env
+  fi
+  echo "Создан .env — проверьте SITE_URL и SMTP"
+fi
+
+npm install --omit=dev
+
+if [ -f deploy/shop.service ]; then
+  cp -f deploy/shop.service /etc/systemd/system/shop.service
+  # Подставить фактический путь в unit
+  sed -i "s|WorkingDirectory=.*|WorkingDirectory=${INSTALL_DIR}|" /etc/systemd/system/shop.service
+  sed -i "s|EnvironmentFile=.*|EnvironmentFile=${INSTALL_DIR}/.env|" /etc/systemd/system/shop.service
+  systemctl daemon-reload
+  systemctl enable shop 2>/dev/null || true
+  systemctl restart shop
+  sleep 2
+  curl -sf http://127.0.0.1:3000/health && echo && echo "OK — shop запущен (systemd)"
+  systemctl reload caddy 2>/dev/null || true
+else
+  echo "deploy/shop.service не найден — запустите: npm start"
+fi
+
+echo ""
+echo "Обновления в будущем:"
+echo "  bash ${INSTALL_DIR}/scripts/server-update.sh"

scripts/setup-postgres-ubuntu.sh

@@ -1,16 +1,18 @@
 #!/bin/bash
-# PostgreSQL 17 на Ubuntu — установка службы, пользователь и БД shop
-# Запуск: sudo bash scripts/setup-postgres-ubuntu.sh
+# PostgreSQL — пользователь и БД shop (после install-postgresql-ubuntu.sh)
+# sudo bash scripts/setup-postgres-ubuntu.sh
 set -euo pipefail
 
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+SHOP_ROOT="${SHOP_ROOT:-$(cd "$SCRIPT_DIR/.." && pwd)}"
+
 DB_USER="${DB_USER:-shop}"
 DB_PASS="${DB_PASS:-shop}"
 DB_NAME="${DB_NAME:-shop}"
 
 if ! command -v psql >/dev/null; then
-  echo "PostgreSQL не установлен."
-  echo "  apt install -y postgresql-17 postgresql-client-17"
-  echo "  systemctl enable --now postgresql"
+  echo "PostgreSQL не установлен. Запустите:"
+  echo "  sudo bash $SCRIPT_DIR/install-postgresql-ubuntu.sh"
   exit 1
 fi
 
@@ -52,7 +54,7 @@ EOF
 
 echo ""
 echo "PostgreSQL готов."
-echo "Добавьте в /opt/shop/.env:"
+echo "Добавьте в ${SHOP_ROOT}/.env:"
 echo "DATABASE_URL=postgresql://${DB_USER}:${DB_PASS}@127.0.0.1:5432/${DB_NAME}"
 echo ""
 echo "Проверка: psql \"postgresql://${DB_USER}:${DB_PASS}@127.0.0.1:5432/${DB_NAME}\" -c 'SELECT 1'"