From 634a46c118b9dcc244f2cdfe07e8cc47ffd52089 Mon Sep 17 00:00:00 2001 From: karpenok Date: Fri, 13 Nov 2026 22:25:52 +0700 Subject: [PATCH] =?UTF-8?q?chore(core-git):=20cutover=20=D0=B0=D0=B4=D1=80?= =?UTF-8?q?=D0=B5=D1=81=D0=BE=D0=B2=20=D0=BD=D0=B0=20192.168.1.105=20?= =?UTF-8?q?=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20=D0=BC=D0=B8=D0=B3=D1=80=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Traefik backend, clone/state URL в workflows и BOOTSTRAP. CT 109 оставлен для rollback. Co-authored-by: Cursor --- .gitea/workflows/ansible-core-git.yml | 2 +- .gitea/workflows/ansible-core-mon.yml | 2 +- .gitea/workflows/ansible-core-net.yml | 2 +- .gitea/workflows/ansible-core-secrets.yml | 2 +- .gitea/workflows/ansible-ger-nod-02.yml | 2 +- .gitea/workflows/ansible-opnsense.yml | 2 +- .gitea/workflows/ansible-rus-central.yml | 2 +- .gitea/workflows/terraform.yml | 8 ++++---- BOOTSTRAP.md | 19 +++++++------------ .../core-net/traefik/files/dynamic/gitea.yml | 2 +- 10 files changed, 19 insertions(+), 24 deletions(-) diff --git a/.gitea/workflows/ansible-core-git.yml b/.gitea/workflows/ansible-core-git.yml index 8a77632..3965072 100644 --- a/.gitea/workflows/ansible-core-git.yml +++ b/.gitea/workflows/ansible-core-git.yml @@ -32,7 +32,7 @@ jobs: run: | set -eu rm -rf "${HOME}/homelab-infra" - git clone http://192.168.1.217:3000/karpenok/homelab-infra.git "${HOME}/homelab-infra" + git clone http://192.168.1.105:3000/karpenok/homelab-infra.git "${HOME}/homelab-infra" sha="${GITHUB_SHA:-${GITEA_SHA:-}}" if [ -n "${sha}" ]; then git -C "${HOME}/homelab-infra" checkout "${sha}" diff --git a/.gitea/workflows/ansible-core-mon.yml b/.gitea/workflows/ansible-core-mon.yml index 0805ba5..1bf46b3 100644 --- a/.gitea/workflows/ansible-core-mon.yml +++ b/.gitea/workflows/ansible-core-mon.yml @@ -31,7 +31,7 @@ jobs: run: | set -eu rm -rf "${HOME}/homelab-infra" - git clone http://192.168.1.217:3000/karpenok/homelab-infra.git "${HOME}/homelab-infra" + git clone http://192.168.1.105:3000/karpenok/homelab-infra.git "${HOME}/homelab-infra" sha="${GITHUB_SHA:-${GITEA_SHA:-}}" if [ -n "${sha}" ]; then git -C "${HOME}/homelab-infra" checkout "${sha}" diff --git a/.gitea/workflows/ansible-core-net.yml b/.gitea/workflows/ansible-core-net.yml index bbfe77d..2f11e07 100644 --- a/.gitea/workflows/ansible-core-net.yml +++ b/.gitea/workflows/ansible-core-net.yml @@ -34,7 +34,7 @@ jobs: run: | set -eu rm -rf "${HOME}/homelab-infra" - git clone http://192.168.1.217:3000/karpenok/homelab-infra.git "${HOME}/homelab-infra" + git clone http://192.168.1.105:3000/karpenok/homelab-infra.git "${HOME}/homelab-infra" sha="${GITHUB_SHA:-${GITEA_SHA:-}}" if [ -n "${sha}" ]; then git -C "${HOME}/homelab-infra" checkout "${sha}" diff --git a/.gitea/workflows/ansible-core-secrets.yml b/.gitea/workflows/ansible-core-secrets.yml index 7d65983..ddf831b 100644 --- a/.gitea/workflows/ansible-core-secrets.yml +++ b/.gitea/workflows/ansible-core-secrets.yml @@ -32,7 +32,7 @@ jobs: run: | set -eu rm -rf "${HOME}/homelab-infra" - git clone http://192.168.1.217:3000/karpenok/homelab-infra.git "${HOME}/homelab-infra" + git clone http://192.168.1.105:3000/karpenok/homelab-infra.git "${HOME}/homelab-infra" sha="${GITHUB_SHA:-${GITEA_SHA:-}}" if [ -n "${sha}" ]; then git -C "${HOME}/homelab-infra" checkout "${sha}" diff --git a/.gitea/workflows/ansible-ger-nod-02.yml b/.gitea/workflows/ansible-ger-nod-02.yml index 5ebf145..d7f6a11 100644 --- a/.gitea/workflows/ansible-ger-nod-02.yml +++ b/.gitea/workflows/ansible-ger-nod-02.yml @@ -33,7 +33,7 @@ jobs: run: | set -eu rm -rf "${HOME}/homelab-infra" - git clone http://192.168.1.217:3000/karpenok/homelab-infra.git "${HOME}/homelab-infra" + git clone http://192.168.1.105:3000/karpenok/homelab-infra.git "${HOME}/homelab-infra" sha="${GITHUB_SHA:-${GITEA_SHA:-}}" if [ -n "${sha}" ]; then git -C "${HOME}/homelab-infra" checkout "${sha}" diff --git a/.gitea/workflows/ansible-opnsense.yml b/.gitea/workflows/ansible-opnsense.yml index 05881aa..4e4e330 100644 --- a/.gitea/workflows/ansible-opnsense.yml +++ b/.gitea/workflows/ansible-opnsense.yml @@ -29,7 +29,7 @@ jobs: run: | set -eu rm -rf "${HOME}/homelab-infra" - git clone http://192.168.1.217:3000/karpenok/homelab-infra.git "${HOME}/homelab-infra" + git clone http://192.168.1.105:3000/karpenok/homelab-infra.git "${HOME}/homelab-infra" sha="${GITHUB_SHA:-${GITEA_SHA:-}}" if [ -n "${sha}" ]; then git -C "${HOME}/homelab-infra" checkout "${sha}" diff --git a/.gitea/workflows/ansible-rus-central.yml b/.gitea/workflows/ansible-rus-central.yml index 9decfc9..8028c8d 100644 --- a/.gitea/workflows/ansible-rus-central.yml +++ b/.gitea/workflows/ansible-rus-central.yml @@ -40,7 +40,7 @@ jobs: run: | set -eu rm -rf "${HOME}/homelab-infra" - git clone http://192.168.1.217:3000/karpenok/homelab-infra.git "${HOME}/homelab-infra" + git clone http://192.168.1.105:3000/karpenok/homelab-infra.git "${HOME}/homelab-infra" sha="${GITHUB_SHA:-${GITEA_SHA:-}}" if [ -n "${sha}" ]; then git -C "${HOME}/homelab-infra" checkout "${sha}" diff --git a/.gitea/workflows/terraform.yml b/.gitea/workflows/terraform.yml index 6ecb507..31a80b8 100644 --- a/.gitea/workflows/terraform.yml +++ b/.gitea/workflows/terraform.yml @@ -58,7 +58,7 @@ jobs: rm -rf "${HOME}/homelab-infra" # Клонируем по прямому IP Gitea, чтобы не зависеть от внешних факторов - git clone http://192.168.1.217:3000/karpenok/homelab-infra.git "${HOME}/homelab-infra" + git clone http://192.168.1.105:3000/karpenok/homelab-infra.git "${HOME}/homelab-infra" sha="${GITHUB_SHA:-${GITEA_SHA:-}}" if [ -n "${sha}" ]; then git -C "${HOME}/homelab-infra" checkout "${sha}" @@ -76,9 +76,9 @@ jobs: cd "${HOME}/homelab-infra/terraform/${TARGET}" terraform init \ - -backend-config="address=http://192.168.1.217:3000/api/packages/karpenok/terraform/state/${TARGET}" \ - -backend-config="lock_address=http://192.168.1.217:3000/api/packages/karpenok/terraform/state/${TARGET}/lock" \ - -backend-config="unlock_address=http://192.168.1.217:3000/api/packages/karpenok/terraform/state/${TARGET}/lock" \ + -backend-config="address=http://192.168.1.105:3000/api/packages/karpenok/terraform/state/${TARGET}" \ + -backend-config="lock_address=http://192.168.1.105:3000/api/packages/karpenok/terraform/state/${TARGET}/lock" \ + -backend-config="unlock_address=http://192.168.1.105:3000/api/packages/karpenok/terraform/state/${TARGET}/lock" \ -backend-config="username=karpenok" \ -backend-config="password=${GITEA_TOKEN}" \ -backend-config="lock_method=POST" \ diff --git a/BOOTSTRAP.md b/BOOTSTRAP.md index 0d0c2f7..3519f08 100644 --- a/BOOTSTRAP.md +++ b/BOOTSTRAP.md @@ -14,7 +14,7 @@ | `ger-nod-02` | `playbooks/ger-nod-02.yml` | `roles/ger-nod-02/netbird`; `roles/ger-nod-02/remnanode`; `roles/ger-nod-02/vmagent` | клиент NetBird; `/opt/remnanode`; `/opt/vmagent` | | `opnsense` | `playbooks/opnsense.yml` | `roles/opnsense/netbird`; `roles/opnsense/xray` | REST API (`192.168.1.1:4433`) | -Полная сверка одной машины: `ansible-playbook playbooks/site.yml --limit <машина>`. Пока боевой инстанс на CT 109, пайплайны клонируют репо с `192.168.1.217`. Целевой `core-git` (CT 904) уже в автоматизации; cutover DNS/Traefik — отдельный шаг миграции. +Полная сверка одной машины: `ansible-playbook playbooks/site.yml --limit <машина>`. Боевой Gitea после cutover — `core-git` (`192.168.1.105`). Пайплайны клонируют с `http://192.168.1.105:3000`. CT 109 на `pve` оставлен как rollback, стек на нём остановлен — не удалять, пока не подтверждён стабильный прогон. --- @@ -32,7 +32,7 @@ Terraform в этом репозитории описывает узел `netcor ### 1.2. Базовые управляющие контейнеры (LXC / Debian 13) | CT ID | Хост PVE | IP | Имя хоста | Продукты | |---|---|---|---|---| -| **CT 109** | `pve` | `192.168.1.217` | `gitea` | Боевой Gitea (`:3000`), Postgres, Actions Runner (`dind`) — до cutover | +| **CT 109** | `pve` | `192.168.1.217` | `gitea` / DNS `gitea-old` | Старый стек остановлен (rollback). Не удалять до проверки | | **CT 901** | `netcore` | `192.168.1.102` | `core-secrets` | Infisical (`:8080`), Postgres, Redis, Vaultwarden (`:8000`) | | **CT 902** | `netcore` | `192.168.1.104` | `core-net` | Traefik (`:80`, `:443`); Remnawave Panel (`127.0.0.1:3000`) + Subscription (`127.0.0.1:3010`); клиент NetBird (нужен `/dev/net/tun`); Authentik (`127.0.0.1:9000`) — опционально, по умолчанию выкл. | | **CT 903** | `netcore` | `192.168.1.108` | `core-mon` | VictoriaMetrics (`:8428`), vmalert (`127.0.0.1:8880`), Alertmanager (`:9093`), Grafana (`:3000`), Ntfy (`:80`) | @@ -144,17 +144,12 @@ API Endpoint (внутренний LAN): `http://192.168.1.102:8080/api` 2. Запустить Proxmox VE на `netcore` (`192.168.1.100`) и `pve` (`192.168.1.2`). 3. Убедиться в доступности SSH по ключам `root_home`. -### Шаг 2. Gitea & Gitea Actions -**Пока cutover не сделан:** боевой стек — CT 109 (`192.168.1.217`), каталог `/root/docker/gitea/`. -**Целевой:** CT 904 `core-git` (`192.168.1.105`), `/opt/gitea`. Пайплайн пишет compose при секретах в Infisical; `docker compose up` — только когда на диске уже есть `postgres/PG_VERSION` (после ручной миграции данных). - -Ручная миграция (кратко): stop на 109 → rsync `gitea/`, `postgres/`, `runner-data/` и volume DinD runner → правка `address` в `.runner` → Unbound `gitea.internal` и Traefik backend на `.105` → `workflow_dispatch` **ansible-core-git** → проверки host `:22`, git `:222`, UI, runner idle → правки `.217` в workflows. - -До cutover cold bootstrap по-прежнему опирается на CT 109: -1. Запустить CT 109 на `pve`. -2. `docker compose up -d` в каталоге Gitea на 109. -3. UI: `http://192.168.1.217:3000`. +### Шаг 2. Gitea & Gitea Actions (CT 904 `core-git`) +1. Поднять CT 904 (`192.168.1.105`), стек в `/opt/gitea` (`docker compose up -d`). +2. UI: `https://gitea.gunihome.ru` или `http://192.168.1.105:3000`. +3. Git SSH: `gitea.internal:222`. DNS: `gitea.internal` → `.105` (старый CT 109 — `gitea-old.internal`). 4. Раннер `homelab` = idle. +5. Rollback: на CT 109 каталог `/root/docker/gitea/`, стек остановлен; Traefik/DNS вернуть на `.217` при необходимости. ### Шаг 3. Хранилище секретов Infisical (CT 901) > [!IMPORTANT] diff --git a/ansible/roles/core-net/traefik/files/dynamic/gitea.yml b/ansible/roles/core-net/traefik/files/dynamic/gitea.yml index 74784f7..3240ad5 100644 --- a/ansible/roles/core-net/traefik/files/dynamic/gitea.yml +++ b/ansible/roles/core-net/traefik/files/dynamic/gitea.yml @@ -13,5 +13,5 @@ http: gitea: loadBalancer: servers: - - url: "http://192.168.1.217:3000" + - url: "http://192.168.1.105:3000"