From 9c692522fb2f5a67da0b2400429f454b78152a20 Mon Sep 17 00:00:00 2001 From: karpenok Date: Tue, 10 Nov 2026 23:55:34 +0700 Subject: [PATCH] refactor: split machine deploys from one-time secrets migration Roles stay under the machine that runs them, CI applies only a known product, and the /opt/secrets move is a one-shot playbook instead of part of every core-secrets run. Co-authored-by: Cursor --- .gitea/workflows/ansible-core-net.yml | 70 ++--------- .gitea/workflows/ansible-core-secrets.yml | 55 ++------- .gitea/workflows/ansible-rus-central.yml | 46 ++++++++ .gitea/workflows/netbird-install.yml | 78 ------------ .gitea/workflows/terraform.yml | 1 - BOOTSTRAP.md | 46 +++++--- ansible/ci/ansible-target.sh | 103 ++++++++++++++++ ansible/ci/deploy-machine.sh | 111 ++++++++++++++++++ ansible/inventories/prod/group_vars/all.yml | 5 +- .../netbird.yml => host_vars/rus-central.yml} | 1 + ansible/inventories/prod/hosts.yml | 34 ++---- ansible/playbooks/core-net.yml | 9 ++ ansible/playbooks/core-secrets.yml | 9 ++ ansible/playbooks/core_net.yml | 8 -- ansible/playbooks/core_secrets.yml | 7 -- ansible/playbooks/migrate-core-secrets.yml | 32 +++++ ansible/playbooks/netbird.yml | 10 -- ansible/playbooks/rus-central.yml | 7 ++ ansible/playbooks/site.yml | 6 +- .../authentik/defaults/main.yml | 0 .../files/blueprints/homelab-directory.yaml | 0 .../files/blueprints/traefik-dashboard.yaml | 2 + .../{ => core-net}/authentik/tasks/main.yml | 0 .../authentik/templates/compose.yaml.j2 | 12 +- .../traefik}/defaults/main.yml | 0 .../traefik}/files/dynamic/authentik.yml | 0 .../traefik}/files/dynamic/books.yml | 0 .../traefik}/files/dynamic/cloud.yml | 0 .../traefik}/files/dynamic/dashboard.yml | 1 + .../traefik}/files/dynamic/erpnext.yml | 0 .../traefik}/files/dynamic/gitea.yml | 0 .../traefik}/files/dynamic/grafana.yml | 0 .../traefik}/files/dynamic/infisical.yml | 0 .../traefik}/files/dynamic/jellyfin.yml | 0 .../traefik}/files/dynamic/lampa.yml | 0 .../traefik}/files/dynamic/matserv.yml | 0 .../traefik}/files/dynamic/navi.yml | 0 .../traefik}/files/dynamic/navi2.yml | 0 .../traefik}/files/dynamic/notes.yml | 0 .../traefik}/files/dynamic/oblako.yml | 0 .../traefik}/files/dynamic/opencloud.yml | 0 .../traefik}/files/dynamic/openwebui.yml | 0 .../traefik}/files/dynamic/pass.yml | 0 .../traefik}/files/dynamic/plex.yml | 0 .../traefik}/files/dynamic/portainer.yml | 0 .../traefik}/files/dynamic/prowlarr.yml | 0 .../traefik}/files/dynamic/qbittorrent.yml | 0 .../traefik}/files/dynamic/radarr.yml | 0 .../traefik}/files/dynamic/remna.yml | 0 .../traefik}/files/dynamic/sonarr.yml | 0 .../traefik}/files/dynamic/spot.yml | 0 .../traefik}/files/dynamic/talk-turn.yml | 0 .../traefik}/files/dynamic/term.yml | 0 .../traefik}/files/dynamic/tune.yml | 0 .../traefik}/files/dynamic/tunetide.yml | 0 .../traefik}/files/dynamic/tv.yml | 0 .../traefik}/files/dynamic/yamtrack.yml | 0 .../traefik}/files/dynamic/yt.yml | 0 .../traefik}/handlers/main.yml | 1 + .../traefik}/tasks/main.yml | 22 ---- .../traefik}/templates/compose.yaml.j2 | 0 .../traefik}/templates/traefik.yml.j2 | 0 .../infisical}/defaults/main.yml | 14 +-- .../core-secrets/infisical/tasks/main.yml | 34 ++++++ .../infisical/templates/compose.yaml.j2 | 51 ++++++++ .../vaultwarden/defaults/main.yml | 6 + .../core-secrets/vaultwarden/tasks/main.yml | 24 ++++ .../vaultwarden/templates/compose.yaml.j2 | 17 +++ ansible/roles/core_secrets/tasks/main.yml | 56 --------- .../core_secrets/templates/compose.yaml.j2 | 73 ------------ .../netbird/defaults/main.yml | 3 +- .../netbird/files/.env.example | 0 .../netbird/files/compose.yaml | 0 .../netbird/handlers/main.yml | 3 +- .../{ => rus-central}/netbird/tasks/main.yml | 3 +- .../netbird/templates/config.yaml.j2 | 0 .../netbird/templates/dashboard.env.j2 | 0 .../netbird/templates/env.j2 | 0 kubernetes/README.md | 6 - .../netcore/{core_net.tf => core-net.tf} | 2 +- .../{core_secrets.tf => core-secrets.tf} | 2 +- terraform/pve/main.tf | 22 ---- terraform/pve/outputs.tf | 1 - terraform/pve/terraform.tfvars.example | 4 - terraform/pve/variables.tf | 32 ----- 85 files changed, 537 insertions(+), 492 deletions(-) create mode 100644 .gitea/workflows/ansible-rus-central.yml delete mode 100644 .gitea/workflows/netbird-install.yml create mode 100644 ansible/ci/ansible-target.sh create mode 100644 ansible/ci/deploy-machine.sh rename ansible/inventories/prod/{group_vars/netbird.yml => host_vars/rus-central.yml} (90%) create mode 100644 ansible/playbooks/core-net.yml create mode 100644 ansible/playbooks/core-secrets.yml delete mode 100644 ansible/playbooks/core_net.yml delete mode 100644 ansible/playbooks/core_secrets.yml create mode 100644 ansible/playbooks/migrate-core-secrets.yml delete mode 100644 ansible/playbooks/netbird.yml create mode 100644 ansible/playbooks/rus-central.yml rename ansible/roles/{ => core-net}/authentik/defaults/main.yml (100%) rename ansible/roles/{ => core-net}/authentik/files/blueprints/homelab-directory.yaml (100%) rename ansible/roles/{ => core-net}/authentik/files/blueprints/traefik-dashboard.yaml (88%) rename ansible/roles/{ => core-net}/authentik/tasks/main.yml (100%) rename ansible/roles/{ => core-net}/authentik/templates/compose.yaml.j2 (91%) rename ansible/roles/{core_net => core-net/traefik}/defaults/main.yml (100%) rename ansible/roles/{core_net => core-net/traefik}/files/dynamic/authentik.yml (100%) rename ansible/roles/{core_net => core-net/traefik}/files/dynamic/books.yml (100%) rename ansible/roles/{core_net => core-net/traefik}/files/dynamic/cloud.yml (100%) rename ansible/roles/{core_net => core-net/traefik}/files/dynamic/dashboard.yml (99%) rename ansible/roles/{core_net => core-net/traefik}/files/dynamic/erpnext.yml (100%) rename ansible/roles/{core_net => core-net/traefik}/files/dynamic/gitea.yml (100%) rename ansible/roles/{core_net => core-net/traefik}/files/dynamic/grafana.yml (100%) rename ansible/roles/{core_net => core-net/traefik}/files/dynamic/infisical.yml (100%) rename ansible/roles/{core_net => core-net/traefik}/files/dynamic/jellyfin.yml (100%) rename ansible/roles/{core_net => core-net/traefik}/files/dynamic/lampa.yml (100%) rename ansible/roles/{core_net => core-net/traefik}/files/dynamic/matserv.yml (100%) rename ansible/roles/{core_net => core-net/traefik}/files/dynamic/navi.yml (100%) rename ansible/roles/{core_net => core-net/traefik}/files/dynamic/navi2.yml (100%) rename ansible/roles/{core_net => core-net/traefik}/files/dynamic/notes.yml (100%) rename ansible/roles/{core_net => core-net/traefik}/files/dynamic/oblako.yml (100%) rename ansible/roles/{core_net => core-net/traefik}/files/dynamic/opencloud.yml (100%) rename ansible/roles/{core_net => core-net/traefik}/files/dynamic/openwebui.yml (100%) rename ansible/roles/{core_net => core-net/traefik}/files/dynamic/pass.yml (100%) rename ansible/roles/{core_net => core-net/traefik}/files/dynamic/plex.yml (100%) rename ansible/roles/{core_net => core-net/traefik}/files/dynamic/portainer.yml (100%) rename ansible/roles/{core_net => core-net/traefik}/files/dynamic/prowlarr.yml (100%) rename ansible/roles/{core_net => core-net/traefik}/files/dynamic/qbittorrent.yml (100%) rename ansible/roles/{core_net => core-net/traefik}/files/dynamic/radarr.yml (100%) rename ansible/roles/{core_net => core-net/traefik}/files/dynamic/remna.yml (100%) rename ansible/roles/{core_net => core-net/traefik}/files/dynamic/sonarr.yml (100%) rename ansible/roles/{core_net => core-net/traefik}/files/dynamic/spot.yml (100%) rename ansible/roles/{core_net => core-net/traefik}/files/dynamic/talk-turn.yml (100%) rename ansible/roles/{core_net => core-net/traefik}/files/dynamic/term.yml (100%) rename ansible/roles/{core_net => core-net/traefik}/files/dynamic/tune.yml (100%) rename ansible/roles/{core_net => core-net/traefik}/files/dynamic/tunetide.yml (100%) rename ansible/roles/{core_net => core-net/traefik}/files/dynamic/tv.yml (100%) rename ansible/roles/{core_net => core-net/traefik}/files/dynamic/yamtrack.yml (100%) rename ansible/roles/{core_net => core-net/traefik}/files/dynamic/yt.yml (100%) rename ansible/roles/{core_net => core-net/traefik}/handlers/main.yml (91%) rename ansible/roles/{core_net => core-net/traefik}/tasks/main.yml (81%) rename ansible/roles/{core_net => core-net/traefik}/templates/compose.yaml.j2 (100%) rename ansible/roles/{core_net => core-net/traefik}/templates/traefik.yml.j2 (100%) rename ansible/roles/{core_secrets => core-secrets/infisical}/defaults/main.yml (56%) create mode 100644 ansible/roles/core-secrets/infisical/tasks/main.yml create mode 100644 ansible/roles/core-secrets/infisical/templates/compose.yaml.j2 create mode 100644 ansible/roles/core-secrets/vaultwarden/defaults/main.yml create mode 100644 ansible/roles/core-secrets/vaultwarden/tasks/main.yml create mode 100644 ansible/roles/core-secrets/vaultwarden/templates/compose.yaml.j2 delete mode 100644 ansible/roles/core_secrets/tasks/main.yml delete mode 100644 ansible/roles/core_secrets/templates/compose.yaml.j2 rename ansible/roles/{ => rus-central}/netbird/defaults/main.yml (52%) rename ansible/roles/{ => rus-central}/netbird/files/.env.example (100%) rename ansible/roles/{ => rus-central}/netbird/files/compose.yaml (100%) rename ansible/roles/{ => rus-central}/netbird/handlers/main.yml (69%) rename ansible/roles/{ => rus-central}/netbird/tasks/main.yml (92%) rename ansible/roles/{ => rus-central}/netbird/templates/config.yaml.j2 (100%) rename ansible/roles/{ => rus-central}/netbird/templates/dashboard.env.j2 (100%) rename ansible/roles/{ => rus-central}/netbird/templates/env.j2 (100%) delete mode 100644 kubernetes/README.md rename terraform/netcore/{core_net.tf => core-net.tf} (91%) rename terraform/netcore/{core_secrets.tf => core-secrets.tf} (87%) delete mode 100644 terraform/pve/main.tf delete mode 100644 terraform/pve/outputs.tf delete mode 100644 terraform/pve/terraform.tfvars.example delete mode 100644 terraform/pve/variables.tf diff --git a/.gitea/workflows/ansible-core-net.yml b/.gitea/workflows/ansible-core-net.yml index 01af788..c51a349 100644 --- a/.gitea/workflows/ansible-core-net.yml +++ b/.gitea/workflows/ansible-core-net.yml @@ -5,9 +5,14 @@ on: branches: - main paths: - - 'ansible/roles/core_net/**' - - 'ansible/roles/authentik/**' - - 'ansible/playbooks/core_net.yml' + - 'ansible/roles/core-net/**' + - 'ansible/roles/host/**' + - 'ansible/playbooks/core-net.yml' + - 'ansible/playbooks/host.yml' + - 'ansible/playbooks/site.yml' + - 'ansible/inventories/prod/hosts.yml' + - 'ansible/inventories/prod/group_vars/**' + - 'ansible/ci/**' workflow_dispatch: jobs: @@ -15,72 +20,19 @@ jobs: runs-on: homelab container: image: homelab-ansible:latest - timeout-minutes: 15 + timeout-minutes: 30 steps: - - name: Деплой Traefik на core-net через Ansible + - name: Деплой core-net env: INFISICAL_CLIENT_ID: ${{ secrets.INFISICAL_CLIENT_ID }} INFISICAL_CLIENT_SECRET: ${{ secrets.INFISICAL_CLIENT_SECRET }} run: | set -eu - - # Прямое подключение к Infisical (CT 901) без зависимости от Traefik - export INFISICAL_PROJECT_ID="806e7f09-5838-492a-946b-2d69b96876ab" - export INFISICAL_DOMAIN="http://192.168.1.102:8080/api" - - TOKEN=$(infisical login \ - --domain="${INFISICAL_DOMAIN}" \ - --method=universal-auth \ - --client-id="${INFISICAL_CLIENT_ID}" \ - --client-secret="${INFISICAL_CLIENT_SECRET}" \ - --plain) - - # Экспорт SSH-ключа раннера из /ci-cd - eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/ci-cd" --format=dotenv-export --silent)" - - # Проверяем наличие секретов Authentik в /services/authentik. - # При первом запуске раннер сам генерирует их и сохраняет в Infisical (Zero-Knowledge). - if ! infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/authentik" --format=dotenv-export --silent 2>/dev/null | grep -q 'AUTHENTIK_SECRET_KEY'; then - infisical secrets-manager folders create authentik --path /services --env prod --projectId "${INFISICAL_PROJECT_ID}" --domain "${INFISICAL_DOMAIN}" --token "${TOKEN}" --silent 2>/dev/null || true - GEN_SECRET_KEY=$(openssl rand -base64 48 | tr -dc 'a-zA-Z0-9' | head -c 50) - GEN_PG_PASS=$(openssl rand -hex 20) - infisical secrets set --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/authentik" \ - "AUTHENTIK_SECRET_KEY=${GEN_SECRET_KEY}" \ - "AUTHENTIK_POSTGRES_PASSWORD=${GEN_PG_PASS}" \ - --silent - unset GEN_SECRET_KEY GEN_PG_PASS - fi - - # Экспорт секретов Authentik из /services/authentik - eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/authentik" --format=dotenv-export --silent)" - export AUTHENTIK_SECRET_KEY="${AUTHENTIK_SECRET_KEY:-}" - export AUTHENTIK_POSTGRES_PASSWORD="${AUTHENTIK_POSTGRES_PASSWORD:-}" - - if [ -z "${RUNNER_SSH_KEY:-}" ]; then - echo "В Infisical (/ci-cd) отсутствует RUNNER_SSH_KEY" >&2 - exit 1 - fi - rm -rf "${HOME}/homelab-infra" - - # Клонируем по прямому IP Gitea (192.168.1.217:3000), чтобы не зависеть от состояния Traefik/DNS git clone http://192.168.1.217:3000/karpenok/homelab-infra.git "${HOME}/homelab-infra" sha="${GITHUB_SHA:-${GITEA_SHA:-}}" if [ -n "${sha}" ]; then git -C "${HOME}/homelab-infra" checkout "${sha}" fi chmod -R go-w "${HOME}/homelab-infra" - - # Настраиваем SSH-ключ раннера - install -d -m 700 "${HOME}/.ssh" - printf '%s\n' "${RUNNER_SSH_KEY}" > "${HOME}/.ssh/id_ed25519" - chmod 600 "${HOME}/.ssh/id_ed25519" - trap 'rm -f "${HOME}/.ssh/id_ed25519"' EXIT - - cd "${HOME}/homelab-infra/ansible" - - export ANSIBLE_HOST_KEY_CHECKING=False - - ansible-playbook playbooks/core_net.yml \ - -i inventories/prod/hosts.yml \ - --private-key "${HOME}/.ssh/id_ed25519" + exec bash "${HOME}/homelab-infra/ansible/ci/deploy-machine.sh" core-net "${{ github.event_name }}" "${{ github.event.before }}" "${{ github.sha }}" diff --git a/.gitea/workflows/ansible-core-secrets.yml b/.gitea/workflows/ansible-core-secrets.yml index 6b6344e..51be9f3 100644 --- a/.gitea/workflows/ansible-core-secrets.yml +++ b/.gitea/workflows/ansible-core-secrets.yml @@ -5,8 +5,15 @@ on: branches: - main paths: - - 'ansible/roles/core_secrets/**' - - 'ansible/playbooks/core_secrets.yml' + - 'ansible/roles/core-secrets/**' + - 'ansible/roles/host/**' + - 'ansible/playbooks/core-secrets.yml' + - 'ansible/playbooks/migrate-core-secrets.yml' + - 'ansible/playbooks/host.yml' + - 'ansible/playbooks/site.yml' + - 'ansible/inventories/prod/hosts.yml' + - 'ansible/inventories/prod/group_vars/**' + - 'ansible/ci/**' workflow_dispatch: jobs: @@ -14,41 +21,14 @@ jobs: runs-on: homelab container: image: homelab-ansible:latest - timeout-minutes: 15 + timeout-minutes: 30 steps: - - name: Деплой core-secrets через Ansible + - name: Деплой core-secrets env: INFISICAL_CLIENT_ID: ${{ secrets.INFISICAL_CLIENT_ID }} INFISICAL_CLIENT_SECRET: ${{ secrets.INFISICAL_CLIENT_SECRET }} run: | set -eu - - # Прямое подключение к Infisical (CT 901) без зависимости от Traefik - export INFISICAL_PROJECT_ID="806e7f09-5838-492a-946b-2d69b96876ab" - export INFISICAL_DOMAIN="http://192.168.1.102:8080/api" - - TOKEN=$(infisical login \ - --domain="${INFISICAL_DOMAIN}" \ - --method=universal-auth \ - --client-id="${INFISICAL_CLIENT_ID}" \ - --client-secret="${INFISICAL_CLIENT_SECRET}" \ - --plain) - - # Подтягиваем SSH-ключ раннера из /ci-cd - eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/ci-cd" --format=dotenv-export --silent)" - - # Подтягиваем ключи infisical из /services/infisical - eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/infisical" --format=dotenv-export --silent)" - - export INFISICAL_POSTGRES_PASSWORD="${POSTGRES_PASSWORD}" - export INFISICAL_ENCRYPTION_KEY="${ENCRYPTION_KEY}" - export INFISICAL_AUTH_SECRET="${AUTH_SECRET}" - - if [ -z "${RUNNER_SSH_KEY:-}" ]; then - echo "В Infisical (/ci-cd) отсутствует RUNNER_SSH_KEY" >&2 - exit 1 - fi - rm -rf "${HOME}/homelab-infra" git clone http://192.168.1.217:3000/karpenok/homelab-infra.git "${HOME}/homelab-infra" sha="${GITHUB_SHA:-${GITEA_SHA:-}}" @@ -56,15 +36,4 @@ jobs: git -C "${HOME}/homelab-infra" checkout "${sha}" fi chmod -R go-w "${HOME}/homelab-infra" - - install -d -m 700 "${HOME}/.ssh" - printf '%s\n' "${RUNNER_SSH_KEY}" > "${HOME}/.ssh/id_ed25519" - chmod 600 "${HOME}/.ssh/id_ed25519" - eval "$(ssh-agent -s)" >/dev/null - ssh-add "${HOME}/.ssh/id_ed25519" 2>/dev/null - trap 'rm -f "${HOME}/.ssh/id_ed25519"' EXIT - - export ANSIBLE_HOST_KEY_CHECKING=False - cd "${HOME}/homelab-infra/ansible" - ansible-playbook -i inventories/prod/hosts.yml playbooks/core_secrets.yml - + exec bash "${HOME}/homelab-infra/ansible/ci/deploy-machine.sh" core-secrets "${{ github.event_name }}" "${{ github.event.before }}" "${{ github.sha }}" diff --git a/.gitea/workflows/ansible-rus-central.yml b/.gitea/workflows/ansible-rus-central.yml new file mode 100644 index 0000000..f178c7e --- /dev/null +++ b/.gitea/workflows/ansible-rus-central.yml @@ -0,0 +1,46 @@ +name: ansible-rus-central + +on: + push: + branches: + - main + paths: + - 'ansible/roles/rus-central/**' + - 'ansible/roles/host/**' + - 'ansible/playbooks/rus-central.yml' + - 'ansible/playbooks/host.yml' + - 'ansible/playbooks/site.yml' + - 'ansible/inventories/prod/hosts.yml' + - 'ansible/inventories/prod/host_vars/rus-central.yml' + - 'ansible/inventories/prod/group_vars/**' + - 'ansible/ci/**' + workflow_dispatch: + inputs: + letsencrypt_email: + description: Почта Let's Encrypt, если её нужно задать отдельно от group_vars + required: false + type: string + default: "" + +jobs: + deploy: + runs-on: homelab + container: + image: homelab-ansible:latest + timeout-minutes: 30 + steps: + - name: Деплой rus-central + env: + INFISICAL_CLIENT_ID: ${{ secrets.INFISICAL_CLIENT_ID }} + INFISICAL_CLIENT_SECRET: ${{ secrets.INFISICAL_CLIENT_SECRET }} + INPUT_LETSENCRYPT_EMAIL: ${{ inputs.letsencrypt_email }} + run: | + set -eu + rm -rf "${HOME}/homelab-infra" + git clone http://192.168.1.217:3000/karpenok/homelab-infra.git "${HOME}/homelab-infra" + sha="${GITHUB_SHA:-${GITEA_SHA:-}}" + if [ -n "${sha}" ]; then + git -C "${HOME}/homelab-infra" checkout "${sha}" + fi + chmod -R go-w "${HOME}/homelab-infra" + exec bash "${HOME}/homelab-infra/ansible/ci/deploy-machine.sh" rus-central "${{ github.event_name }}" "${{ github.event.before }}" "${{ github.sha }}" diff --git a/.gitea/workflows/netbird-install.yml b/.gitea/workflows/netbird-install.yml deleted file mode 100644 index 5b547b4..0000000 --- a/.gitea/workflows/netbird-install.yml +++ /dev/null @@ -1,78 +0,0 @@ -name: netbird-install - -on: - workflow_dispatch: - inputs: - letsencrypt_email: - description: Почта для уведомлений Let's Encrypt (по умолчанию из group_vars/all.yml) - required: false - type: string - default: 'vvkarpenok@gmail.com' - -jobs: - install: - runs-on: homelab - container: - image: homelab-ansible:latest - timeout-minutes: 30 - steps: - - name: Запустить плейбук NetBird - env: - INFISICAL_CLIENT_ID: ${{ secrets.INFISICAL_CLIENT_ID }} - INFISICAL_CLIENT_SECRET: ${{ secrets.INFISICAL_CLIENT_SECRET }} - NETBIRD_LETSENCRYPT_EMAIL: ${{ inputs.letsencrypt_email }} - run: | - set -eu - - # Прямое подключение к Infisical (CT 901) без зависимости от Traefik - export INFISICAL_PROJECT_ID="806e7f09-5838-492a-946b-2d69b96876ab" - export INFISICAL_DOMAIN="http://192.168.1.102:8080/api" - - TOKEN=$(infisical login \ - --domain="${INFISICAL_DOMAIN}" \ - --method=universal-auth \ - --client-id="${INFISICAL_CLIENT_ID}" \ - --client-secret="${INFISICAL_CLIENT_SECRET}" \ - --plain) - - eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/ci-cd" --format=dotenv-export --silent)" - - if [ -z "${RUNNER_SSH_KEY:-}" ]; then - echo "В Infisical (/ci-cd) отсутствует RUNNER_SSH_KEY." >&2 - exit 1 - fi - - install -d -m 700 "${HOME}/.ssh" - printf '%s\n' "${RUNNER_SSH_KEY}" > "${HOME}/.ssh/id_ed25519" - chmod 600 "${HOME}/.ssh/id_ed25519" - trap 'rm -f "${HOME}/.ssh/id_ed25519"' EXIT - - # Подтягиваем боевые ключи NetBird из Infisical - eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/netbird" --format=dotenv-export --silent)" - export NETBIRD_AUTH_SECRET="${NETBIRD_AUTH_SECRET:-}" - export NETBIRD_DATASTORE_KEY="${NETBIRD_DATASTORE_KEY:-}" - export NETBIRD_SESSION_KEY="${NETBIRD_SESSION_KEY:-}" - export NETBIRD_DOMAIN="${NETBIRD_DOMAIN:-}" - export NETBIRD_LETSENCRYPT_EMAIL="${NETBIRD_LETSENCRYPT_EMAIL:-}" - - rm -rf "${HOME}/homelab-infra" - git clone http://192.168.1.217:3000/karpenok/homelab-infra.git "${HOME}/homelab-infra" - sha="${GITHUB_SHA:-${GITEA_SHA:-}}" - if [ -n "${sha}" ]; then - git -C "${HOME}/homelab-infra" checkout "${sha}" - fi - chmod -R go-w "${HOME}/homelab-infra" - - export ANSIBLE_HOST_KEY_CHECKING=False - cd "${HOME}/homelab-infra/ansible" - - extra_args=() - if [ -n "${NETBIRD_LETSENCRYPT_EMAIL:-}" ]; then - extra_args+=("-e" "netbird_letsencrypt_email=${NETBIRD_LETSENCRYPT_EMAIL}") - fi - - ansible-playbook playbooks/site.yml \ - -i inventories/prod/hosts.yml \ - --limit netbird \ - --private-key "${HOME}/.ssh/id_ed25519" \ - "${extra_args[@]}" diff --git a/.gitea/workflows/terraform.yml b/.gitea/workflows/terraform.yml index dd31a79..c1507d6 100644 --- a/.gitea/workflows/terraform.yml +++ b/.gitea/workflows/terraform.yml @@ -9,7 +9,6 @@ on: type: choice options: - netcore - - pve default: netcore action: description: 'Действие Terraform (plan / apply)' diff --git a/BOOTSTRAP.md b/BOOTSTRAP.md index f10f20d..7a975f4 100644 --- a/BOOTSTRAP.md +++ b/BOOTSTRAP.md @@ -1,6 +1,16 @@ # Инструкция по развертыванию инфраструктуры (Bootstrap Guide) -Документ описывает контур, который поднимает этот репозиторий, порядок холодного старта и секреты в Infisical. Gitea в автоматизацию не входит: без неё не запустить пайплайны. +Плейбук называется машиной. В `roles/<машина>/` лежат продукты этой машины: один каталог, один Compose, один путь `/opt/<продукт>`. База и кэш остаются внутри Compose этого продукта. Роль `host` стоит отдельно: она готовит любую машину и ни одному продукту не принадлежит. + +Пайплайн подключается к машине, а применяет только роли, чьи файлы изменились (`--tags`). Роль `host` ставит пакеты, Docker и SSH. Она выполняется вместе со всеми продуктами машины, когда меняются плейбук, инвентарь или сама роль `host`, и при ручном запуске. + +| Машина | Плейбук | Роли | Каталоги | +|---|---|---|---| +| `core-net` | `playbooks/core-net.yml` | `roles/core-net/traefik`, `roles/core-net/authentik` | `/opt/traefik`, `/opt/authentik` | +| `core-secrets` | `playbooks/core-secrets.yml` | `roles/core-secrets/infisical`, `roles/core-secrets/vaultwarden` | `/opt/infisical`, `/opt/vaultwarden` | +| `rus-central` | `playbooks/rus-central.yml` | `roles/rus-central/netbird` | `/opt/netbird` | + +Полная сверка одной машины: `ansible-playbook playbooks/site.yml --limit <машина>`. Gitea в автоматизацию не входит: без неё не запустить пайплайны. --- @@ -13,8 +23,10 @@ | **pve** | `192.168.1.2:8006` | PVE Main Node / Services | `root@192.168.1.2` (LAN only) | | **opnsense** | `192.168.1.1` | Маршрутизатор / Шлюз | Шлюз по умолчанию | +Terraform в этом репозитории описывает только узел `netcore`. Узел `pve` и CT 109 поднимаются отдельно. + ### 1.2. Базовые управляющие контейнеры (LXC / Debian 13) -| CT ID | Хост PVE | IP | Имя хоста | Сервисы | +| CT ID | Хост PVE | IP | Имя хоста | Продукты | |---|---|---|---|---| | **CT 109** | `pve` | `192.168.1.217` | `gitea` | Gitea (`:3000`), Postgres (`:5432`), Gitea Actions Runner (`dind`) | | **CT 901** | `netcore` | `192.168.1.102` | `core-secrets` | Infisical (`:8080`), Postgres, Redis, Vaultwarden (`:8000`) | @@ -23,7 +35,9 @@ ### 1.3. Внешние узлы | Имя | IP | Роль | Стек | |---|---|---|---| -| **rus-central** | `45.154.185.208` | Внешний шлюз NetBird | Docker Compose: NetBird Management, Signal, Dashboard, Coturn | +| **rus-central** | `45.154.185.208` | Внешний шлюз NetBird | `/opt/netbird`: NetBird и его собственный Traefik | + +Домен панели NetBird задаётся в `ansible/inventories/prod/host_vars/rus-central.yml`. --- @@ -45,19 +59,16 @@ API Endpoint (внутренний LAN): `http://192.168.1.102:8080/api` - `AUTHENTIK_SECRET_KEY`: случайный ключ шифрования сессий Authentik. - `AUTHENTIK_POSTGRES_PASSWORD`: пароль БД PostgreSQL Authentik. - `/services/netbird`: - - `COMPOSE_PROJECT_NAME`: имя docker compose проекта (`netbird`). - - `NETBIRD_DOMAIN`: домен панели NetBird. - - `NETBIRD_LETSENCRYPT_EMAIL`: email для SSL-сертификатов. + - `NETBIRD_LETSENCRYPT_EMAIL`: почта для сертификата. Если секрета нет, берётся `letsencrypt_email` из `group_vars/all.yml`. - `NETBIRD_AUTH_SECRET`: секрет auth. - `NETBIRD_DATASTORE_KEY`: 32-байтный ключ SQLite/datastore. - `NETBIRD_SESSION_KEY`: 32-байтный ключ веб-сессий. - `/proxmox/netcore`: - - `PROXMOX_ENDPOINT`: `https://192.168.1.100:8006/api2/json` - - `PROXMOX_API_TOKEN`: токен `root@pam!terraform=UUID` -- `/proxmox/pve`: - - `PROXMOX_ENDPOINT`: `https://192.168.1.2:8006/api2/json` + - `PROXMOX_ENDPOINT`: `https://192.168.1.100:8006/` - `PROXMOX_API_TOKEN`: токен `root@pam!terraform=UUID` +Провайдер Proxmox сам дописывает `/api2/json`. В секрет его класть не нужно. Секреты `/proxmox/pve` этот репозиторий не читает: Terraform описывает только узел `netcore`. + --- ## 3. Последовательность холодного старта (Cold Bootstrap) @@ -80,22 +91,23 @@ API Endpoint (внутренний LAN): `http://192.168.1.102:8080/api` > Мастер-ключи начальной загрузки Infisical (`ENCRYPTION_KEY`, `AUTH_SECRET`, `POSTGRES_PASSWORD`) являются первоисточником шифрования и физически не могут храниться внутри самого Infisical. Они должны быть надежно сохранены в личном оффлайн-менеджере паролей администратора (KeePassXC / Bitwarden / 1Password). 1. Создать/запустить CT 901 (`core-secrets`, IP `192.168.1.102`). -2. Развернуть `/opt/secrets/compose.yaml`, подставив мастер-ключи из оффлайн-хранилища. -3. Запустить контейнеры: `docker compose -f /opt/secrets/compose.yaml up -d`. +2. Для первого старта вручную положить Compose Infisical в `/opt/infisical/compose.yaml` и подставить мастер-ключи из оффлайн-хранилища. Пайплайну эти ключи пока неоткуда прочитать. +3. Запустить контейнеры: `docker compose -f /opt/infisical/compose.yaml up -d`. 4. Проверить API: `curl http://192.168.1.102:8080/api/status`. 5. В Gitea Settings → Secrets добавить репозиторные секреты: - `INFISICAL_CLIENT_ID` (Machine Identity: `ci-cd-runner`) - `INFISICAL_CLIENT_SECRET` -Дальнейшие изменения этого стека накатывает пайплайн **`ansible-core-secrets`**. Первым запуском он не заменяет ручной старт: мастер-ключи ещё неоткуда прочитать. +Дальше стек ведёт пайплайн **`ansible-core-secrets`**: Infisical в `/opt/infisical`, Vaultwarden в `/opt/vaultwarden`. Пока в репозитории есть `playbooks/migrate-core-secrets.yml`, пайплайн один раз переносит данные из `/opt/secrets` и останавливает старый Compose. Тома при этом не удаляются. После успешного переноса этот плейбук из репозитория убирается. ### Шаг 4. Traefik и Authentik (CT 902) -1. Запустить пайплайн **`ansible-core-net`** в Gitea Actions. +1. Запустить пайплайн **`ansible-core-net`** в Gitea Actions. Первый прогон на новом CT должен быть полным: ручной запуск выполняет `site.yml --limit core-net` и ставит Docker ролью `host`. 2. Раннер подключается напрямую к `http://192.168.1.102:8080/api`, забирает SSH-ключ раннера и секреты Authentik из `/services/authentik`. Если секретов Authentik ещё нет, раннер генерирует их и сохраняет в Infisical. 3. Плейбук поднимает на CT 902 Traefik и Authentik. Authentik слушает только `127.0.0.1:9000`; снаружи его публикует Traefik как `https://auth.gunihome.ru`. Blueprint создаёт группы `admins` и `family`, пользователей `karpenok` и `ksynia` и закрывает панель Traefik группой `admins`. Пароли blueprint не задаёт. 4. Проверить `https://auth.gunihome.ru`, `https://proxy.gunihome.ru`, `gitea.gunihome.ru` и `infisical.gunihome.ru`. Панель открывается учёткой из группы `admins`. Первый запуск Authentik создаёт `akadmin`; одноразовый пароль пишется в лог контейнера `authentik-server`. `akadmin` в группу `admins` не входит. -### Шаг 5. Внешние сервисы (NetBird на VPS) -1. Запустить пайплайн **`netbird-install`** в Gitea Actions. -2. Раннер считывает боевые ключи из `/services/netbird` и деплоит стек NetBird на `45.154.185.208`. +Правка только роли `traefik` или только роли `authentik` ставит эту роль, без повторной подготовки машины. +### Шаг 5. NetBird (rus-central) +1. Запустить пайплайн **`ansible-rus-central`** в Gitea Actions. Ручной запуск сверяет машину целиком. Push в `roles/rus-central/netbird` ставит только NetBird. +2. Раннер считывает ключи из `/services/netbird` и деплоит стек в `/opt/netbird` на `45.154.185.208`. Домен берётся из `host_vars/rus-central.yml`. diff --git a/ansible/ci/ansible-target.sh b/ansible/ci/ansible-target.sh new file mode 100644 index 0000000..577b64d --- /dev/null +++ b/ansible/ci/ansible-target.sh @@ -0,0 +1,103 @@ +#!/bin/sh +# Печатает аргументы ansible-playbook для одной машины. +# Полный прогон только для общих файлов: playbooks/site.yml, --limit, <машина> +# Продукт из коммита: playbooks/<машина>.yml, --tags, role[,role] +# Неизвестный файл внутри roles/<машина>/ завершает скрипт с кодом 2. +# Коммит без файлов этой машины ничего не печатает и завершается с кодом 0. +set -eu + +machine=${1:?machine} +event=${2:-} +before=${3:-} +after=${4:-} + +case "$machine" in + core-net | core-secrets | rus-central) ;; + *) + echo "Неизвестная машина: $machine" >&2 + exit 2 + ;; +esac + +full=0 +changed="" + +case "$event" in + push) ;; + *) full=1 ;; +esac + +case "$before" in + "" | 0000000000000000000000000000000000000000) full=1 ;; +esac + +if [ "$full" -eq 0 ]; then + changed=$(git diff --name-only "$before" "$after" 2>/dev/null) || full=1 +fi + +tags="" +full_from_files=0 +unknown=0 + +add_tag() { + case ",$tags," in + *",$1,"*) ;; + *) tags="${tags:+$tags,}$1" ;; + esac +} + +reject_unknown() { + echo "Неизвестный файл продукта на ${machine}: $1" >&2 + unknown=1 +} + +if [ "$full" -eq 0 ] && [ -n "$changed" ]; then + old_ifs=$IFS + IFS=' +' + set -f + for file in $changed; do + [ -n "$file" ] || continue + case "$file" in + ansible/roles/host/* | ansible/playbooks/host.yml | ansible/playbooks/site.yml | ansible/playbooks/"$machine".yml | ansible/inventories/prod/hosts.yml | ansible/inventories/prod/group_vars/* | ansible/inventories/prod/host_vars/"$machine".yml | ansible/ci/*) + full_from_files=1 + ;; + ansible/roles/core-net/traefik/*) + [ "$machine" = "core-net" ] && add_tag traefik + ;; + ansible/roles/core-net/authentik/*) + [ "$machine" = "core-net" ] && add_tag authentik + ;; + ansible/roles/core-net/*) + [ "$machine" = "core-net" ] && reject_unknown "$file" + ;; + ansible/roles/core-secrets/infisical/*) + [ "$machine" = "core-secrets" ] && add_tag infisical + ;; + ansible/roles/core-secrets/vaultwarden/*) + [ "$machine" = "core-secrets" ] && add_tag vaultwarden + ;; + ansible/roles/core-secrets/*) + [ "$machine" = "core-secrets" ] && reject_unknown "$file" + ;; + ansible/roles/rus-central/netbird/*) + [ "$machine" = "rus-central" ] && add_tag netbird + ;; + ansible/roles/rus-central/*) + [ "$machine" = "rus-central" ] && reject_unknown "$file" + ;; + esac + done + set +f + IFS=$old_ifs +fi + +if [ "$unknown" -eq 1 ]; then + exit 2 +fi + +if [ "$full" -eq 1 ] || [ "$full_from_files" -eq 1 ]; then + printf '%s\n' "playbooks/site.yml" "--limit" "$machine" +elif [ -n "$tags" ]; then + printf '%s\n' "playbooks/${machine}.yml" "--tags" "$tags" +fi diff --git a/ansible/ci/deploy-machine.sh b/ansible/ci/deploy-machine.sh new file mode 100644 index 0000000..ca71413 --- /dev/null +++ b/ansible/ci/deploy-machine.sh @@ -0,0 +1,111 @@ +#!/bin/bash +# Вход в Infisical, SSH и ansible-playbook для одной машины. +# Репозиторий уже должен быть склонирован: скрипт лежит внутри него. +set -euo pipefail + +machine=${1:?machine} +event=${2:-} +before=${3:-} +after=${4:-} + +case "$machine" in + core-net | core-secrets | rus-central) ;; + *) + echo "Неизвестная машина: $machine" >&2 + exit 2 + ;; +esac + +if [ -z "${INFISICAL_CLIENT_ID:-}" ] || [ -z "${INFISICAL_CLIENT_SECRET:-}" ]; then + echo "Нет INFISICAL_CLIENT_ID или INFISICAL_CLIENT_SECRET" >&2 + exit 1 +fi + +export INFISICAL_PROJECT_ID="806e7f09-5838-492a-946b-2d69b96876ab" +export INFISICAL_DOMAIN="http://192.168.1.102:8080/api" + +TOKEN=$(infisical login \ + --domain="${INFISICAL_DOMAIN}" \ + --method=universal-auth \ + --client-id="${INFISICAL_CLIENT_ID}" \ + --client-secret="${INFISICAL_CLIENT_SECRET}" \ + --plain) + +eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/ci-cd" --format=dotenv-export --silent)" + +if [ -z "${RUNNER_SSH_KEY:-}" ]; then + echo "В Infisical (/ci-cd) отсутствует RUNNER_SSH_KEY" >&2 + exit 1 +fi + +install -d -m 700 "${HOME}/.ssh" +printf '%s\n' "${RUNNER_SSH_KEY}" > "${HOME}/.ssh/id_ed25519" +chmod 600 "${HOME}/.ssh/id_ed25519" +trap 'rm -f "${HOME}/.ssh/id_ed25519"' EXIT + +extra=() + +case "$machine" in + core-net) + if ! infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/authentik" --format=dotenv-export --silent 2>/dev/null | grep -q 'AUTHENTIK_SECRET_KEY'; then + infisical secrets-manager folders create authentik --path /services --env prod --projectId "${INFISICAL_PROJECT_ID}" --domain "${INFISICAL_DOMAIN}" --token "${TOKEN}" --silent 2>/dev/null || true + GEN_SECRET_KEY=$(openssl rand -base64 48 | tr -dc 'a-zA-Z0-9' | head -c 50) + GEN_PG_PASS=$(openssl rand -hex 20) + infisical secrets set --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/authentik" \ + "AUTHENTIK_SECRET_KEY=${GEN_SECRET_KEY}" \ + "AUTHENTIK_POSTGRES_PASSWORD=${GEN_PG_PASS}" \ + --silent + unset GEN_SECRET_KEY GEN_PG_PASS + fi + eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/authentik" --format=dotenv-export --silent)" + export AUTHENTIK_SECRET_KEY="${AUTHENTIK_SECRET_KEY:-}" + export AUTHENTIK_POSTGRES_PASSWORD="${AUTHENTIK_POSTGRES_PASSWORD:-}" + ;; + core-secrets) + eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/infisical" --format=dotenv-export --silent)" + export INFISICAL_POSTGRES_PASSWORD="${POSTGRES_PASSWORD}" + export INFISICAL_ENCRYPTION_KEY="${ENCRYPTION_KEY}" + export INFISICAL_AUTH_SECRET="${AUTH_SECRET}" + ;; + rus-central) + input_email="${INPUT_LETSENCRYPT_EMAIL:-}" + eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/netbird" --format=dotenv-export --silent)" + export NETBIRD_AUTH_SECRET="${NETBIRD_AUTH_SECRET:-}" + export NETBIRD_DATASTORE_KEY="${NETBIRD_DATASTORE_KEY:-}" + export NETBIRD_SESSION_KEY="${NETBIRD_SESSION_KEY:-}" + if [ -n "$input_email" ]; then + NETBIRD_LETSENCRYPT_EMAIL="$input_email" + fi + if [ -n "${NETBIRD_LETSENCRYPT_EMAIL:-}" ]; then + extra+=(-e "netbird_letsencrypt_email=${NETBIRD_LETSENCRYPT_EMAIL}") + fi + ;; +esac + +root=$(CDPATH= cd -- "$(dirname "$0")/../.." && pwd) +cd "$root" + +target_file=$(mktemp) +bash ansible/ci/ansible-target.sh "$machine" "$event" "$before" "$after" > "$target_file" +mapfile -t target < "$target_file" +rm -f "$target_file" + +if [ "${#target[@]}" -eq 0 ]; then + echo "Для ${machine} нет применимых изменений." + exit 0 +fi + +export ANSIBLE_HOST_KEY_CHECKING=False +cd "$root/ansible" +key="${HOME}/.ssh/id_ed25519" + +if [ "$machine" = "core-secrets" ] && [ -f playbooks/migrate-core-secrets.yml ]; then + ansible-playbook playbooks/migrate-core-secrets.yml \ + -i inventories/prod/hosts.yml \ + --private-key "$key" +fi + +ansible-playbook "${target[@]}" \ + -i inventories/prod/hosts.yml \ + --private-key "$key" \ + "${extra[@]}" diff --git a/ansible/inventories/prod/group_vars/all.yml b/ansible/inventories/prod/group_vars/all.yml index f30be1c..1f0d109 100644 --- a/ansible/inventories/prod/group_vars/all.yml +++ b/ansible/inventories/prod/group_vars/all.yml @@ -1,5 +1,2 @@ --- -# Общие глобальные переменные для всей инфраструктуры homelab (окружение prod) -admin_email: vvkarpenok@gmail.com -letsencrypt_email: "{{ admin_email }}" - +letsencrypt_email: vvkarpenok@gmail.com diff --git a/ansible/inventories/prod/group_vars/netbird.yml b/ansible/inventories/prod/host_vars/rus-central.yml similarity index 90% rename from ansible/inventories/prod/group_vars/netbird.yml rename to ansible/inventories/prod/host_vars/rus-central.yml index 3473a14..9c776f5 100644 --- a/ansible/inventories/prod/group_vars/netbird.yml +++ b/ansible/inventories/prod/host_vars/rus-central.yml @@ -1 +1,2 @@ +--- netbird_domain: central.gunihome.ru diff --git a/ansible/inventories/prod/hosts.yml b/ansible/inventories/prod/hosts.yml index 32e99fa..2949b1b 100644 --- a/ansible/inventories/prod/hosts.yml +++ b/ansible/inventories/prod/hosts.yml @@ -1,24 +1,12 @@ +# Машины. Состав каждой машины — в playbooks/<хост>.yml. all: - children: - home: - hosts: - core-net: - ansible_host: 192.168.1.104 - ansible_user: root - core-secrets: - ansible_host: 192.168.1.102 - ansible_user: root - core_net: - hosts: - core-net: - core_secrets: - hosts: - core-secrets: - vps: - hosts: - rus-central: - ansible_host: 45.154.185.208 - ansible_user: root - netbird: - hosts: - rus-central: + hosts: + core-net: + ansible_host: 192.168.1.104 + ansible_user: root + core-secrets: + ansible_host: 192.168.1.102 + ansible_user: root + rus-central: + ansible_host: 45.154.185.208 + ansible_user: root diff --git a/ansible/playbooks/core-net.yml b/ansible/playbooks/core-net.yml new file mode 100644 index 0000000..274cf17 --- /dev/null +++ b/ansible/playbooks/core-net.yml @@ -0,0 +1,9 @@ +--- +- name: CT 902, входной узел + hosts: core-net + become: true + roles: + - role: core-net/traefik + tags: [traefik] + - role: core-net/authentik + tags: [authentik] diff --git a/ansible/playbooks/core-secrets.yml b/ansible/playbooks/core-secrets.yml new file mode 100644 index 0000000..a9e8549 --- /dev/null +++ b/ansible/playbooks/core-secrets.yml @@ -0,0 +1,9 @@ +--- +- name: CT 901, секреты + hosts: core-secrets + become: true + roles: + - role: core-secrets/infisical + tags: [infisical] + - role: core-secrets/vaultwarden + tags: [vaultwarden] diff --git a/ansible/playbooks/core_net.yml b/ansible/playbooks/core_net.yml deleted file mode 100644 index fdcdd81..0000000 --- a/ansible/playbooks/core_net.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- name: Развернуть сетевой шлюз и аутентификацию (core-net) - hosts: core_net - become: true - roles: - - core_net - - authentik - diff --git a/ansible/playbooks/core_secrets.yml b/ansible/playbooks/core_secrets.yml deleted file mode 100644 index 205277e..0000000 --- a/ansible/playbooks/core_secrets.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -- name: Развернуть сейф секретов (core-secrets) - hosts: core_secrets - become: true - roles: - - core_secrets - diff --git a/ansible/playbooks/migrate-core-secrets.yml b/ansible/playbooks/migrate-core-secrets.yml new file mode 100644 index 0000000..62d5d4e --- /dev/null +++ b/ansible/playbooks/migrate-core-secrets.yml @@ -0,0 +1,32 @@ +--- +# Одноразовый перенос /opt/secrets. После успешного прогона на CT 901 файл удаляется. +- name: Перенести данные прежнего стека core-secrets + hosts: core-secrets + become: true + tasks: + - name: Остановить прежний общий стек /opt/secrets + ansible.builtin.command: docker compose -f /opt/secrets/compose.yaml down + args: + removes: /opt/secrets/compose.yaml + + - name: Перенести данные Infisical в /opt/infisical + ansible.builtin.command: mv /opt/secrets/infisical /opt/infisical + args: + removes: /opt/secrets/infisical + creates: /opt/infisical + + - name: Перенести данные Vaultwarden в /opt/vaultwarden + ansible.builtin.command: mv /opt/secrets/vaultwarden /opt/vaultwarden + args: + removes: /opt/secrets/vaultwarden + creates: /opt/vaultwarden + + - name: Убрать compose прежнего общего стека + ansible.builtin.file: + path: /opt/secrets/compose.yaml + state: absent + + - name: Удалить пустой каталог прежнего стека + ansible.builtin.command: rmdir /opt/secrets + args: + removes: /opt/secrets diff --git a/ansible/playbooks/netbird.yml b/ansible/playbooks/netbird.yml deleted file mode 100644 index 506ebd1..0000000 --- a/ansible/playbooks/netbird.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -- name: Установить панель NetBird - hosts: netbird - gather_facts: false - roles: - - role: netbird - tags: - - netbird - - vpn - - config diff --git a/ansible/playbooks/rus-central.yml b/ansible/playbooks/rus-central.yml new file mode 100644 index 0000000..5fccc49 --- /dev/null +++ b/ansible/playbooks/rus-central.yml @@ -0,0 +1,7 @@ +--- +- name: VPS rus-central, NetBird + hosts: rus-central + gather_facts: false + roles: + - role: rus-central/netbird + tags: [netbird] diff --git a/ansible/playbooks/site.yml b/ansible/playbooks/site.yml index 110d727..da54399 100644 --- a/ansible/playbooks/site.yml +++ b/ansible/playbooks/site.yml @@ -1,5 +1,5 @@ --- - ansible.builtin.import_playbook: host.yml -- ansible.builtin.import_playbook: core_net.yml -- ansible.builtin.import_playbook: core_secrets.yml -- ansible.builtin.import_playbook: netbird.yml +- ansible.builtin.import_playbook: core-net.yml +- ansible.builtin.import_playbook: core-secrets.yml +- ansible.builtin.import_playbook: rus-central.yml diff --git a/ansible/roles/authentik/defaults/main.yml b/ansible/roles/core-net/authentik/defaults/main.yml similarity index 100% rename from ansible/roles/authentik/defaults/main.yml rename to ansible/roles/core-net/authentik/defaults/main.yml diff --git a/ansible/roles/authentik/files/blueprints/homelab-directory.yaml b/ansible/roles/core-net/authentik/files/blueprints/homelab-directory.yaml similarity index 100% rename from ansible/roles/authentik/files/blueprints/homelab-directory.yaml rename to ansible/roles/core-net/authentik/files/blueprints/homelab-directory.yaml diff --git a/ansible/roles/authentik/files/blueprints/traefik-dashboard.yaml b/ansible/roles/core-net/authentik/files/blueprints/traefik-dashboard.yaml similarity index 88% rename from ansible/roles/authentik/files/blueprints/traefik-dashboard.yaml rename to ansible/roles/core-net/authentik/files/blueprints/traefik-dashboard.yaml index ae32f96..a0a8c8e 100644 --- a/ansible/roles/authentik/files/blueprints/traefik-dashboard.yaml +++ b/ansible/roles/core-net/authentik/files/blueprints/traefik-dashboard.yaml @@ -37,6 +37,8 @@ entries: attrs: group: !KeyOf group-admins + # providers ниже — полный список embedded outpost. + # Новый proxy-провайдер добавляется в этот файл, а не только в интерфейсе. - model: authentik_outposts.outpost identifiers: name: authentik Embedded Outpost diff --git a/ansible/roles/authentik/tasks/main.yml b/ansible/roles/core-net/authentik/tasks/main.yml similarity index 100% rename from ansible/roles/authentik/tasks/main.yml rename to ansible/roles/core-net/authentik/tasks/main.yml diff --git a/ansible/roles/authentik/templates/compose.yaml.j2 b/ansible/roles/core-net/authentik/templates/compose.yaml.j2 similarity index 91% rename from ansible/roles/authentik/templates/compose.yaml.j2 rename to ansible/roles/core-net/authentik/templates/compose.yaml.j2 index 4c71120..7f10f7c 100644 --- a/ansible/roles/authentik/templates/compose.yaml.j2 +++ b/ansible/roles/core-net/authentik/templates/compose.yaml.j2 @@ -4,7 +4,7 @@ services: container_name: authentik-db restart: unless-stopped environment: - POSTGRES_PASSWORD: {{ authentik_postgres_password }} + POSTGRES_PASSWORD: {{ authentik_postgres_password | to_json }} POSTGRES_USER: authentik POSTGRES_DB: authentik volumes: @@ -18,7 +18,7 @@ services: - authentik-net authentik-redis: - image: redis:alpine + image: redis:7-alpine container_name: authentik-redis restart: unless-stopped volumes: @@ -41,8 +41,8 @@ services: AUTHENTIK_POSTGRESQL__HOST: authentik-db AUTHENTIK_POSTGRESQL__USER: authentik AUTHENTIK_POSTGRESQL__NAME: authentik - AUTHENTIK_POSTGRESQL__PASSWORD: {{ authentik_postgres_password }} - AUTHENTIK_SECRET_KEY: {{ authentik_secret_key }} + AUTHENTIK_POSTGRESQL__PASSWORD: {{ authentik_postgres_password | to_json }} + AUTHENTIK_SECRET_KEY: {{ authentik_secret_key | to_json }} AUTHENTIK_DISABLE_UPDATE_CHECK: "true" AUTHENTIK_DISABLE_STARTUP_ANALYTICS: "true" AUTHENTIK_ERROR_REPORTING__ENABLED: "false" @@ -71,8 +71,8 @@ services: AUTHENTIK_POSTGRESQL__HOST: authentik-db AUTHENTIK_POSTGRESQL__USER: authentik AUTHENTIK_POSTGRESQL__NAME: authentik - AUTHENTIK_POSTGRESQL__PASSWORD: {{ authentik_postgres_password }} - AUTHENTIK_SECRET_KEY: {{ authentik_secret_key }} + AUTHENTIK_POSTGRESQL__PASSWORD: {{ authentik_postgres_password | to_json }} + AUTHENTIK_SECRET_KEY: {{ authentik_secret_key | to_json }} AUTHENTIK_DISABLE_UPDATE_CHECK: "true" AUTHENTIK_DISABLE_STARTUP_ANALYTICS: "true" AUTHENTIK_ERROR_REPORTING__ENABLED: "false" diff --git a/ansible/roles/core_net/defaults/main.yml b/ansible/roles/core-net/traefik/defaults/main.yml similarity index 100% rename from ansible/roles/core_net/defaults/main.yml rename to ansible/roles/core-net/traefik/defaults/main.yml diff --git a/ansible/roles/core_net/files/dynamic/authentik.yml b/ansible/roles/core-net/traefik/files/dynamic/authentik.yml similarity index 100% rename from ansible/roles/core_net/files/dynamic/authentik.yml rename to ansible/roles/core-net/traefik/files/dynamic/authentik.yml diff --git a/ansible/roles/core_net/files/dynamic/books.yml b/ansible/roles/core-net/traefik/files/dynamic/books.yml similarity index 100% rename from ansible/roles/core_net/files/dynamic/books.yml rename to ansible/roles/core-net/traefik/files/dynamic/books.yml diff --git a/ansible/roles/core_net/files/dynamic/cloud.yml b/ansible/roles/core-net/traefik/files/dynamic/cloud.yml similarity index 100% rename from ansible/roles/core_net/files/dynamic/cloud.yml rename to ansible/roles/core-net/traefik/files/dynamic/cloud.yml diff --git a/ansible/roles/core_net/files/dynamic/dashboard.yml b/ansible/roles/core-net/traefik/files/dynamic/dashboard.yml similarity index 99% rename from ansible/roles/core_net/files/dynamic/dashboard.yml rename to ansible/roles/core-net/traefik/files/dynamic/dashboard.yml index 92a207e..ca371ff 100644 --- a/ansible/roles/core_net/files/dynamic/dashboard.yml +++ b/ansible/roles/core-net/traefik/files/dynamic/dashboard.yml @@ -9,3 +9,4 @@ http: - authentik@file tls: certResolver: letsencrypt + diff --git a/ansible/roles/core_net/files/dynamic/erpnext.yml b/ansible/roles/core-net/traefik/files/dynamic/erpnext.yml similarity index 100% rename from ansible/roles/core_net/files/dynamic/erpnext.yml rename to ansible/roles/core-net/traefik/files/dynamic/erpnext.yml diff --git a/ansible/roles/core_net/files/dynamic/gitea.yml b/ansible/roles/core-net/traefik/files/dynamic/gitea.yml similarity index 100% rename from ansible/roles/core_net/files/dynamic/gitea.yml rename to ansible/roles/core-net/traefik/files/dynamic/gitea.yml diff --git a/ansible/roles/core_net/files/dynamic/grafana.yml b/ansible/roles/core-net/traefik/files/dynamic/grafana.yml similarity index 100% rename from ansible/roles/core_net/files/dynamic/grafana.yml rename to ansible/roles/core-net/traefik/files/dynamic/grafana.yml diff --git a/ansible/roles/core_net/files/dynamic/infisical.yml b/ansible/roles/core-net/traefik/files/dynamic/infisical.yml similarity index 100% rename from ansible/roles/core_net/files/dynamic/infisical.yml rename to ansible/roles/core-net/traefik/files/dynamic/infisical.yml diff --git a/ansible/roles/core_net/files/dynamic/jellyfin.yml b/ansible/roles/core-net/traefik/files/dynamic/jellyfin.yml similarity index 100% rename from ansible/roles/core_net/files/dynamic/jellyfin.yml rename to ansible/roles/core-net/traefik/files/dynamic/jellyfin.yml diff --git a/ansible/roles/core_net/files/dynamic/lampa.yml b/ansible/roles/core-net/traefik/files/dynamic/lampa.yml similarity index 100% rename from ansible/roles/core_net/files/dynamic/lampa.yml rename to ansible/roles/core-net/traefik/files/dynamic/lampa.yml diff --git a/ansible/roles/core_net/files/dynamic/matserv.yml b/ansible/roles/core-net/traefik/files/dynamic/matserv.yml similarity index 100% rename from ansible/roles/core_net/files/dynamic/matserv.yml rename to ansible/roles/core-net/traefik/files/dynamic/matserv.yml diff --git a/ansible/roles/core_net/files/dynamic/navi.yml b/ansible/roles/core-net/traefik/files/dynamic/navi.yml similarity index 100% rename from ansible/roles/core_net/files/dynamic/navi.yml rename to ansible/roles/core-net/traefik/files/dynamic/navi.yml diff --git a/ansible/roles/core_net/files/dynamic/navi2.yml b/ansible/roles/core-net/traefik/files/dynamic/navi2.yml similarity index 100% rename from ansible/roles/core_net/files/dynamic/navi2.yml rename to ansible/roles/core-net/traefik/files/dynamic/navi2.yml diff --git a/ansible/roles/core_net/files/dynamic/notes.yml b/ansible/roles/core-net/traefik/files/dynamic/notes.yml similarity index 100% rename from ansible/roles/core_net/files/dynamic/notes.yml rename to ansible/roles/core-net/traefik/files/dynamic/notes.yml diff --git a/ansible/roles/core_net/files/dynamic/oblako.yml b/ansible/roles/core-net/traefik/files/dynamic/oblako.yml similarity index 100% rename from ansible/roles/core_net/files/dynamic/oblako.yml rename to ansible/roles/core-net/traefik/files/dynamic/oblako.yml diff --git a/ansible/roles/core_net/files/dynamic/opencloud.yml b/ansible/roles/core-net/traefik/files/dynamic/opencloud.yml similarity index 100% rename from ansible/roles/core_net/files/dynamic/opencloud.yml rename to ansible/roles/core-net/traefik/files/dynamic/opencloud.yml diff --git a/ansible/roles/core_net/files/dynamic/openwebui.yml b/ansible/roles/core-net/traefik/files/dynamic/openwebui.yml similarity index 100% rename from ansible/roles/core_net/files/dynamic/openwebui.yml rename to ansible/roles/core-net/traefik/files/dynamic/openwebui.yml diff --git a/ansible/roles/core_net/files/dynamic/pass.yml b/ansible/roles/core-net/traefik/files/dynamic/pass.yml similarity index 100% rename from ansible/roles/core_net/files/dynamic/pass.yml rename to ansible/roles/core-net/traefik/files/dynamic/pass.yml diff --git a/ansible/roles/core_net/files/dynamic/plex.yml b/ansible/roles/core-net/traefik/files/dynamic/plex.yml similarity index 100% rename from ansible/roles/core_net/files/dynamic/plex.yml rename to ansible/roles/core-net/traefik/files/dynamic/plex.yml diff --git a/ansible/roles/core_net/files/dynamic/portainer.yml b/ansible/roles/core-net/traefik/files/dynamic/portainer.yml similarity index 100% rename from ansible/roles/core_net/files/dynamic/portainer.yml rename to ansible/roles/core-net/traefik/files/dynamic/portainer.yml diff --git a/ansible/roles/core_net/files/dynamic/prowlarr.yml b/ansible/roles/core-net/traefik/files/dynamic/prowlarr.yml similarity index 100% rename from ansible/roles/core_net/files/dynamic/prowlarr.yml rename to ansible/roles/core-net/traefik/files/dynamic/prowlarr.yml diff --git a/ansible/roles/core_net/files/dynamic/qbittorrent.yml b/ansible/roles/core-net/traefik/files/dynamic/qbittorrent.yml similarity index 100% rename from ansible/roles/core_net/files/dynamic/qbittorrent.yml rename to ansible/roles/core-net/traefik/files/dynamic/qbittorrent.yml diff --git a/ansible/roles/core_net/files/dynamic/radarr.yml b/ansible/roles/core-net/traefik/files/dynamic/radarr.yml similarity index 100% rename from ansible/roles/core_net/files/dynamic/radarr.yml rename to ansible/roles/core-net/traefik/files/dynamic/radarr.yml diff --git a/ansible/roles/core_net/files/dynamic/remna.yml b/ansible/roles/core-net/traefik/files/dynamic/remna.yml similarity index 100% rename from ansible/roles/core_net/files/dynamic/remna.yml rename to ansible/roles/core-net/traefik/files/dynamic/remna.yml diff --git a/ansible/roles/core_net/files/dynamic/sonarr.yml b/ansible/roles/core-net/traefik/files/dynamic/sonarr.yml similarity index 100% rename from ansible/roles/core_net/files/dynamic/sonarr.yml rename to ansible/roles/core-net/traefik/files/dynamic/sonarr.yml diff --git a/ansible/roles/core_net/files/dynamic/spot.yml b/ansible/roles/core-net/traefik/files/dynamic/spot.yml similarity index 100% rename from ansible/roles/core_net/files/dynamic/spot.yml rename to ansible/roles/core-net/traefik/files/dynamic/spot.yml diff --git a/ansible/roles/core_net/files/dynamic/talk-turn.yml b/ansible/roles/core-net/traefik/files/dynamic/talk-turn.yml similarity index 100% rename from ansible/roles/core_net/files/dynamic/talk-turn.yml rename to ansible/roles/core-net/traefik/files/dynamic/talk-turn.yml diff --git a/ansible/roles/core_net/files/dynamic/term.yml b/ansible/roles/core-net/traefik/files/dynamic/term.yml similarity index 100% rename from ansible/roles/core_net/files/dynamic/term.yml rename to ansible/roles/core-net/traefik/files/dynamic/term.yml diff --git a/ansible/roles/core_net/files/dynamic/tune.yml b/ansible/roles/core-net/traefik/files/dynamic/tune.yml similarity index 100% rename from ansible/roles/core_net/files/dynamic/tune.yml rename to ansible/roles/core-net/traefik/files/dynamic/tune.yml diff --git a/ansible/roles/core_net/files/dynamic/tunetide.yml b/ansible/roles/core-net/traefik/files/dynamic/tunetide.yml similarity index 100% rename from ansible/roles/core_net/files/dynamic/tunetide.yml rename to ansible/roles/core-net/traefik/files/dynamic/tunetide.yml diff --git a/ansible/roles/core_net/files/dynamic/tv.yml b/ansible/roles/core-net/traefik/files/dynamic/tv.yml similarity index 100% rename from ansible/roles/core_net/files/dynamic/tv.yml rename to ansible/roles/core-net/traefik/files/dynamic/tv.yml diff --git a/ansible/roles/core_net/files/dynamic/yamtrack.yml b/ansible/roles/core-net/traefik/files/dynamic/yamtrack.yml similarity index 100% rename from ansible/roles/core_net/files/dynamic/yamtrack.yml rename to ansible/roles/core-net/traefik/files/dynamic/yamtrack.yml diff --git a/ansible/roles/core_net/files/dynamic/yt.yml b/ansible/roles/core-net/traefik/files/dynamic/yt.yml similarity index 100% rename from ansible/roles/core_net/files/dynamic/yt.yml rename to ansible/roles/core-net/traefik/files/dynamic/yt.yml diff --git a/ansible/roles/core_net/handlers/main.yml b/ansible/roles/core-net/traefik/handlers/main.yml similarity index 91% rename from ansible/roles/core_net/handlers/main.yml rename to ansible/roles/core-net/traefik/handlers/main.yml index 6b2d2fc..eefd765 100644 --- a/ansible/roles/core_net/handlers/main.yml +++ b/ansible/roles/core-net/traefik/handlers/main.yml @@ -2,3 +2,4 @@ - name: Перезапустить Traefik ansible.builtin.command: docker compose -f {{ traefik_dir }}/compose.yaml up -d --force-recreate --remove-orphans changed_when: true + tags: [always] diff --git a/ansible/roles/core_net/tasks/main.yml b/ansible/roles/core-net/traefik/tasks/main.yml similarity index 81% rename from ansible/roles/core_net/tasks/main.yml rename to ansible/roles/core-net/traefik/tasks/main.yml index a79f8d4..3e5d041 100644 --- a/ansible/roles/core_net/tasks/main.yml +++ b/ansible/roles/core-net/traefik/tasks/main.yml @@ -1,26 +1,4 @@ --- -- name: Установить базовые пакеты Debian - ansible.builtin.apt: - name: - - python3 - - ca-certificates - - curl - state: present - update_cache: true - -- name: Установить Docker и Docker Compose - ansible.builtin.apt: - name: - - docker.io - - docker-compose - state: present - -- name: Включить и запустить службу Docker - ansible.builtin.systemd: - name: docker - enabled: true - state: started - - name: Создать каталоги Traefik ansible.builtin.file: path: "{{ item }}" diff --git a/ansible/roles/core_net/templates/compose.yaml.j2 b/ansible/roles/core-net/traefik/templates/compose.yaml.j2 similarity index 100% rename from ansible/roles/core_net/templates/compose.yaml.j2 rename to ansible/roles/core-net/traefik/templates/compose.yaml.j2 diff --git a/ansible/roles/core_net/templates/traefik.yml.j2 b/ansible/roles/core-net/traefik/templates/traefik.yml.j2 similarity index 100% rename from ansible/roles/core_net/templates/traefik.yml.j2 rename to ansible/roles/core-net/traefik/templates/traefik.yml.j2 diff --git a/ansible/roles/core_secrets/defaults/main.yml b/ansible/roles/core-secrets/infisical/defaults/main.yml similarity index 56% rename from ansible/roles/core_secrets/defaults/main.yml rename to ansible/roles/core-secrets/infisical/defaults/main.yml index b26eae8..77a898e 100644 --- a/ansible/roles/core_secrets/defaults/main.yml +++ b/ansible/roles/core-secrets/infisical/defaults/main.yml @@ -1,22 +1,14 @@ --- -secrets_dir: /opt/secrets -vaultwarden_data_dir: /opt/secrets/vaultwarden/data -infisical_data_dir: /opt/secrets/infisical -vaultwarden_port: 8000 -vaultwarden_ws_port: 3012 +infisical_dir: /opt/infisical infisical_port: 8080 -vaultwarden_image: "vaultwarden/server:1.37.5" infisical_image: "infisical/infisical:v0.167.7" infisical_postgres_image: "postgres:15-alpine" infisical_redis_image: "redis:7-alpine" -vaultwarden_domain: "https://pass.gunihome.ru" infisical_site_url: "https://infisical.gunihome.ru" - -infisical_postgres_user: "infisical" +infisical_postgres_user: infisical +infisical_postgres_db: infisical infisical_postgres_password: "{{ lookup('env', 'INFISICAL_POSTGRES_PASSWORD') }}" -infisical_postgres_db: "infisical" infisical_encryption_key: "{{ lookup('env', 'INFISICAL_ENCRYPTION_KEY') }}" infisical_auth_secret: "{{ lookup('env', 'INFISICAL_AUTH_SECRET') }}" - diff --git a/ansible/roles/core-secrets/infisical/tasks/main.yml b/ansible/roles/core-secrets/infisical/tasks/main.yml new file mode 100644 index 0000000..13b4799 --- /dev/null +++ b/ansible/roles/core-secrets/infisical/tasks/main.yml @@ -0,0 +1,34 @@ +--- +- name: Создать каталоги Infisical + ansible.builtin.file: + path: "{{ item.path }}" + state: directory + owner: "{{ item.owner }}" + group: "{{ item.group }}" + mode: "{{ item.mode }}" + loop: + - { path: "{{ infisical_dir }}", owner: "root", group: "root", mode: "0755" } + - { path: "{{ infisical_dir }}/db", owner: "70", group: "70", mode: "0700" } + - { path: "{{ infisical_dir }}/redis", owner: "999", group: "999", mode: "0700" } + +- name: Проверить наличие обязательных секретов Infisical + ansible.builtin.assert: + that: + - infisical_postgres_password is defined and infisical_postgres_password | length > 0 + - infisical_encryption_key is defined and infisical_encryption_key | length > 0 + - infisical_auth_secret is defined and infisical_auth_secret | length > 0 + fail_msg: "Один или несколько обязательных секретов (INFISICAL_POSTGRES_PASSWORD, INFISICAL_ENCRYPTION_KEY, INFISICAL_AUTH_SECRET) не переданы через переменные окружения." + +- name: Установить compose.yaml для Infisical + ansible.builtin.template: + src: compose.yaml.j2 + dest: "{{ infisical_dir }}/compose.yaml" + owner: root + group: root + mode: "0600" + no_log: true + +- name: Запустить Infisical + ansible.builtin.command: docker compose -f {{ infisical_dir }}/compose.yaml up -d --remove-orphans + register: compose_up + changed_when: "'Started' in compose_up.stderr or 'Created' in compose_up.stderr or 'Recreated' in compose_up.stderr or 'Pulled' in compose_up.stderr" diff --git a/ansible/roles/core-secrets/infisical/templates/compose.yaml.j2 b/ansible/roles/core-secrets/infisical/templates/compose.yaml.j2 new file mode 100644 index 0000000..5aeabb5 --- /dev/null +++ b/ansible/roles/core-secrets/infisical/templates/compose.yaml.j2 @@ -0,0 +1,51 @@ +name: infisical + +services: + infisical-db: + image: {{ infisical_postgres_image }} + container_name: infisical-db + restart: unless-stopped + environment: + POSTGRES_USER: {{ infisical_postgres_user | to_json }} + POSTGRES_PASSWORD: {{ infisical_postgres_password | to_json }} + POSTGRES_DB: {{ infisical_postgres_db | to_json }} + volumes: + - {{ infisical_dir }}/db:/var/lib/postgresql/data + healthcheck: + test: ["CMD-SHELL", "pg_isready -U {{ infisical_postgres_user }} -d {{ infisical_postgres_db }}"] + interval: 5s + timeout: 5s + retries: 10 + start_period: 20s + + infisical-redis: + image: {{ infisical_redis_image }} + container_name: infisical-redis + restart: unless-stopped + volumes: + - {{ infisical_dir }}/redis:/data + healthcheck: + test: ["CMD", "redis-cli", "ping"] + interval: 5s + timeout: 3s + retries: 10 + start_period: 5s + + infisical: + image: {{ infisical_image }} + container_name: infisical + restart: unless-stopped + depends_on: + infisical-db: + condition: service_healthy + infisical-redis: + condition: service_healthy + environment: + NODE_ENV: production + ENCRYPTION_KEY: {{ infisical_encryption_key | to_json }} + AUTH_SECRET: {{ infisical_auth_secret | to_json }} + DB_CONNECTION_URI: {{ ("postgres://" ~ infisical_postgres_user ~ ":" ~ (infisical_postgres_password | urlencode) ~ "@infisical-db:5432/" ~ infisical_postgres_db) | to_json }} + REDIS_URL: redis://infisical-redis:6379 + SITE_URL: {{ infisical_site_url | to_json }} + ports: + - "{{ infisical_port }}:8080" diff --git a/ansible/roles/core-secrets/vaultwarden/defaults/main.yml b/ansible/roles/core-secrets/vaultwarden/defaults/main.yml new file mode 100644 index 0000000..7c001ad --- /dev/null +++ b/ansible/roles/core-secrets/vaultwarden/defaults/main.yml @@ -0,0 +1,6 @@ +--- +vaultwarden_dir: /opt/vaultwarden +vaultwarden_data_dir: /opt/vaultwarden/data +vaultwarden_port: 8000 +vaultwarden_image: "vaultwarden/server:1.37.5" +vaultwarden_domain: "https://pass.gunihome.ru" diff --git a/ansible/roles/core-secrets/vaultwarden/tasks/main.yml b/ansible/roles/core-secrets/vaultwarden/tasks/main.yml new file mode 100644 index 0000000..3a47917 --- /dev/null +++ b/ansible/roles/core-secrets/vaultwarden/tasks/main.yml @@ -0,0 +1,24 @@ +--- +- name: Создать каталоги Vaultwarden + ansible.builtin.file: + path: "{{ item }}" + state: directory + owner: root + group: root + mode: "0755" + loop: + - "{{ vaultwarden_dir }}" + - "{{ vaultwarden_data_dir }}" + +- name: Установить compose.yaml для Vaultwarden + ansible.builtin.template: + src: compose.yaml.j2 + dest: "{{ vaultwarden_dir }}/compose.yaml" + owner: root + group: root + mode: "0644" + +- name: Запустить Vaultwarden + ansible.builtin.command: docker compose -f {{ vaultwarden_dir }}/compose.yaml up -d --remove-orphans + register: compose_up + changed_when: "'Started' in compose_up.stderr or 'Created' in compose_up.stderr or 'Recreated' in compose_up.stderr or 'Pulled' in compose_up.stderr" diff --git a/ansible/roles/core-secrets/vaultwarden/templates/compose.yaml.j2 b/ansible/roles/core-secrets/vaultwarden/templates/compose.yaml.j2 new file mode 100644 index 0000000..f844336 --- /dev/null +++ b/ansible/roles/core-secrets/vaultwarden/templates/compose.yaml.j2 @@ -0,0 +1,17 @@ +name: vaultwarden + +services: + vaultwarden: + image: {{ vaultwarden_image }} + container_name: vaultwarden + restart: unless-stopped + environment: + DOMAIN: {{ vaultwarden_domain | to_json }} + SIGNUPS_ALLOWED: "false" + INVITATIONS_ALLOWED: "true" + SHOW_PASSWORD_HINT: "false" + TZ: Asia/Krasnoyarsk + volumes: + - {{ vaultwarden_data_dir }}:/data + ports: + - "{{ vaultwarden_port }}:80" diff --git a/ansible/roles/core_secrets/tasks/main.yml b/ansible/roles/core_secrets/tasks/main.yml deleted file mode 100644 index 589f1e4..0000000 --- a/ansible/roles/core_secrets/tasks/main.yml +++ /dev/null @@ -1,56 +0,0 @@ ---- -- name: Установить базовые пакеты Debian - ansible.builtin.apt: - name: - - python3 - - ca-certificates - - curl - - rsync - state: present - update_cache: true - -- name: Установить Docker и Docker Compose - ansible.builtin.apt: - name: - - docker.io - - docker-compose - state: present - -- name: Включить и запустить службу Docker - ansible.builtin.systemd: - name: docker - enabled: true - state: started - -- name: Создать каталоги для сервисов secrets - ansible.builtin.file: - path: "{{ item }}" - state: directory - owner: root - group: root - mode: "0755" - loop: - - "{{ secrets_dir }}" - - "{{ vaultwarden_data_dir }}" - - "{{ infisical_data_dir }}" - -- name: Проверить наличие обязательных секретов Infisical - ansible.builtin.assert: - that: - - infisical_postgres_password is defined and infisical_postgres_password | length > 0 - - infisical_encryption_key is defined and infisical_encryption_key | length > 0 - - infisical_auth_secret is defined and infisical_auth_secret | length > 0 - fail_msg: "Один или несколько обязательных секретов (INFISICAL_POSTGRES_PASSWORD, INFISICAL_ENCRYPTION_KEY, INFISICAL_AUTH_SECRET) не переданы через переменные окружения!" - -- name: Установить compose.yaml для core-secrets - ansible.builtin.template: - src: compose.yaml.j2 - dest: "{{ secrets_dir }}/compose.yaml" - owner: root - group: root - mode: "0640" - -- name: Запустить сервисы core-secrets через Docker Compose - ansible.builtin.command: docker compose -f {{ secrets_dir }}/compose.yaml up -d --remove-orphans - register: compose_up - changed_when: "'Started' in compose_up.stderr or 'Created' in compose_up.stderr or 'Recreated' in compose_up.stderr or 'Pulled' in compose_up.stderr" diff --git a/ansible/roles/core_secrets/templates/compose.yaml.j2 b/ansible/roles/core_secrets/templates/compose.yaml.j2 deleted file mode 100644 index f339c6d..0000000 --- a/ansible/roles/core_secrets/templates/compose.yaml.j2 +++ /dev/null @@ -1,73 +0,0 @@ -services: - vaultwarden: - image: {{ vaultwarden_image }} - container_name: vaultwarden - restart: unless-stopped - environment: - - DOMAIN={{ vaultwarden_domain }} - - SIGNUPS_ALLOWED=false - - INVITATIONS_ALLOWED=true - - SHOW_PASSWORD_HINT=false - - WEBSOCKET_ENABLED=true - - TZ=Asia/Krasnoyarsk - volumes: - - {{ vaultwarden_data_dir }}:/data - ports: - - "{{ vaultwarden_port }}:80" - - "{{ vaultwarden_ws_port }}:3012" - networks: - - secrets-net - - infisical-db: - image: {{ infisical_postgres_image }} - container_name: infisical-db - restart: unless-stopped - environment: - POSTGRES_USER: {{ infisical_postgres_user }} - POSTGRES_PASSWORD: {{ infisical_postgres_password }} - POSTGRES_DB: {{ infisical_postgres_db }} - volumes: - - {{ infisical_data_dir }}/db:/var/lib/postgresql/data - healthcheck: - test: ["CMD-SHELL", "pg_isready -U {{ infisical_postgres_user }} -d {{ infisical_postgres_db }}"] - interval: 5s - timeout: 5s - retries: 10 - networks: - - secrets-net - - infisical-redis: - image: {{ infisical_redis_image }} - container_name: infisical-redis - restart: unless-stopped - volumes: - - {{ infisical_data_dir }}/redis:/data - networks: - - secrets-net - - infisical: - image: {{ infisical_image }} - container_name: infisical - restart: unless-stopped - depends_on: - infisical-db: - condition: service_healthy - infisical-redis: - condition: service_started - environment: - - NODE_ENV=production - - ENCRYPTION_KEY={{ infisical_encryption_key }} - - AUTH_SECRET={{ infisical_auth_secret }} - - DB_CONNECTION_URI=postgres://{{ infisical_postgres_user }}:{{ infisical_postgres_password }}@infisical-db:5432/{{ infisical_postgres_db }} - - REDIS_URL=redis://infisical-redis:6379 - - SITE_URL={{ infisical_site_url }} - ports: - - "{{ infisical_port }}:8080" - networks: - - secrets-net - -networks: - secrets-net: - name: secrets-net - driver: bridge - diff --git a/ansible/roles/netbird/defaults/main.yml b/ansible/roles/rus-central/netbird/defaults/main.yml similarity index 52% rename from ansible/roles/netbird/defaults/main.yml rename to ansible/roles/rus-central/netbird/defaults/main.yml index 17113fa..d1e30c0 100644 --- a/ansible/roles/netbird/defaults/main.yml +++ b/ansible/roles/rus-central/netbird/defaults/main.yml @@ -5,8 +5,7 @@ netbird_ports: - 443/tcp - 3478/udp -netbird_domain: "{{ lookup('env', 'NETBIRD_DOMAIN') | default('central.myguni.ru', true) }}" -netbird_letsencrypt_email: "{{ lookup('env', 'NETBIRD_LETSENCRYPT_EMAIL') | default(letsencrypt_email | default(admin_email | default('vvkarpenok@gmail.com')), true) }}" +netbird_letsencrypt_email: "{{ letsencrypt_email }}" netbird_auth_secret: "{{ lookup('env', 'NETBIRD_AUTH_SECRET') }}" netbird_datastore_key: "{{ lookup('env', 'NETBIRD_DATASTORE_KEY') }}" diff --git a/ansible/roles/netbird/files/.env.example b/ansible/roles/rus-central/netbird/files/.env.example similarity index 100% rename from ansible/roles/netbird/files/.env.example rename to ansible/roles/rus-central/netbird/files/.env.example diff --git a/ansible/roles/netbird/files/compose.yaml b/ansible/roles/rus-central/netbird/files/compose.yaml similarity index 100% rename from ansible/roles/netbird/files/compose.yaml rename to ansible/roles/rus-central/netbird/files/compose.yaml diff --git a/ansible/roles/netbird/handlers/main.yml b/ansible/roles/rus-central/netbird/handlers/main.yml similarity index 69% rename from ansible/roles/netbird/handlers/main.yml rename to ansible/roles/rus-central/netbird/handlers/main.yml index 1fb22b9..9f1f5f1 100644 --- a/ansible/roles/netbird/handlers/main.yml +++ b/ansible/roles/rus-central/netbird/handlers/main.yml @@ -1,8 +1,9 @@ --- - name: Перезапустить NetBird - ansible.builtin.command: docker compose up -d --remove-orphans + ansible.builtin.command: docker compose up -d --force-recreate --remove-orphans args: chdir: "{{ netbird_dir }}" register: compose_up changed_when: "'Started' in compose_up.stderr or 'Created' in compose_up.stderr or 'Recreated' in compose_up.stderr" + tags: [always] diff --git a/ansible/roles/netbird/tasks/main.yml b/ansible/roles/rus-central/netbird/tasks/main.yml similarity index 92% rename from ansible/roles/netbird/tasks/main.yml rename to ansible/roles/rus-central/netbird/tasks/main.yml index e5e5f46..0b6b60a 100644 --- a/ansible/roles/netbird/tasks/main.yml +++ b/ansible/roles/rus-central/netbird/tasks/main.yml @@ -21,11 +21,12 @@ - name: Проверить наличие обязательных секретов NetBird ansible.builtin.assert: that: + - netbird_domain is defined and netbird_domain | length > 3 - netbird_auth_secret is defined and netbird_auth_secret | length > 0 - netbird_datastore_key is defined and netbird_datastore_key | length > 0 - netbird_session_key is defined and netbird_session_key | length > 0 - netbird_letsencrypt_email is defined and netbird_letsencrypt_email | length > 3 - fail_msg: "Один или несколько обязательных секретов NetBird (NETBIRD_AUTH_SECRET, NETBIRD_DATASTORE_KEY, NETBIRD_SESSION_KEY, NETBIRD_LETSENCRYPT_EMAIL) не переданы из Infisical!" + fail_msg: "Не задан домен NetBird (host_vars) или один из секретов NETBIRD_AUTH_SECRET, NETBIRD_DATASTORE_KEY, NETBIRD_SESSION_KEY, NETBIRD_LETSENCRYPT_EMAIL." tags: - config diff --git a/ansible/roles/netbird/templates/config.yaml.j2 b/ansible/roles/rus-central/netbird/templates/config.yaml.j2 similarity index 100% rename from ansible/roles/netbird/templates/config.yaml.j2 rename to ansible/roles/rus-central/netbird/templates/config.yaml.j2 diff --git a/ansible/roles/netbird/templates/dashboard.env.j2 b/ansible/roles/rus-central/netbird/templates/dashboard.env.j2 similarity index 100% rename from ansible/roles/netbird/templates/dashboard.env.j2 rename to ansible/roles/rus-central/netbird/templates/dashboard.env.j2 diff --git a/ansible/roles/netbird/templates/env.j2 b/ansible/roles/rus-central/netbird/templates/env.j2 similarity index 100% rename from ansible/roles/netbird/templates/env.j2 rename to ansible/roles/rus-central/netbird/templates/env.j2 diff --git a/kubernetes/README.md b/kubernetes/README.md deleted file mode 100644 index b92f45a..0000000 --- a/kubernetes/README.md +++ /dev/null @@ -1,6 +0,0 @@ -# Kubernetes (Слой 3: Workloads) - -Здесь будут размещаться: -- `bootstrap/` — скрипты инициализации K3s/RKE2/Talos, установка ArgoCD / Helm. -- `apps/` — декларативные манифесты сервисов homelab, синхронизируемые через ArgoCD (GitOps). - diff --git a/terraform/netcore/core_net.tf b/terraform/netcore/core-net.tf similarity index 91% rename from terraform/netcore/core_net.tf rename to terraform/netcore/core-net.tf index 3d2378f..a40c732 100644 --- a/terraform/netcore/core_net.tf +++ b/terraform/netcore/core-net.tf @@ -1,5 +1,5 @@ resource "proxmox_virtual_environment_container" "core_net" { - description = "Managed by Terraform: core-net Ingress Gateway (Traefik)" + description = "Managed by Terraform: core-net (Traefik, Authentik)" node_name = var.proxmox_node vm_id = 902 diff --git a/terraform/netcore/core_secrets.tf b/terraform/netcore/core-secrets.tf similarity index 87% rename from terraform/netcore/core_secrets.tf rename to terraform/netcore/core-secrets.tf index 30c7cfc..0820f37 100644 --- a/terraform/netcore/core_secrets.tf +++ b/terraform/netcore/core-secrets.tf @@ -1,5 +1,5 @@ resource "proxmox_virtual_environment_container" "core_secrets" { - description = "Managed by Terraform: core-secrets Zero-Day Secrets Vault (Infisical, Vaultwarden, Agent Vault)" + description = "Managed by Terraform: core-secrets (Infisical, Vaultwarden)" node_name = var.proxmox_node vm_id = 901 diff --git a/terraform/pve/main.tf b/terraform/pve/main.tf deleted file mode 100644 index 98a41db..0000000 --- a/terraform/pve/main.tf +++ /dev/null @@ -1,22 +0,0 @@ -terraform { - required_version = ">= 1.5.0" - - required_providers { - proxmox = { - source = "bpg/proxmox" - version = "~> 0.70.0" - } - } - - backend "http" {} -} - -provider "proxmox" { - endpoint = var.proxmox_endpoint - api_token = var.proxmox_api_token - insecure = var.proxmox_insecure - - ssh { - agent = true - } -} diff --git a/terraform/pve/outputs.tf b/terraform/pve/outputs.tf deleted file mode 100644 index 570ef7d..0000000 --- a/terraform/pve/outputs.tf +++ /dev/null @@ -1 +0,0 @@ -# Выходные параметры для узла pve diff --git a/terraform/pve/terraform.tfvars.example b/terraform/pve/terraform.tfvars.example deleted file mode 100644 index 2172cad..0000000 --- a/terraform/pve/terraform.tfvars.example +++ /dev/null @@ -1,4 +0,0 @@ -proxmox_endpoint = "https://192.168.1.2:8006/" -proxmox_api_token = "root@pam!automation-stack=00000000-0000-0000-0000-000000000000" -proxmox_insecure = true -proxmox_node = "pve" diff --git a/terraform/pve/variables.tf b/terraform/pve/variables.tf deleted file mode 100644 index d1cb498..0000000 --- a/terraform/pve/variables.tf +++ /dev/null @@ -1,32 +0,0 @@ -variable "proxmox_endpoint" { - description = "URL Proxmox API для узла pve" - type = string - default = "https://192.168.1.2:8006/" -} - -variable "proxmox_api_token" { - description = "API Token Proxmox в формате USER@REALM!TOKENID=UUID_SECRET" - type = string - sensitive = true -} - -variable "proxmox_insecure" { - description = "Разрешить самоподписанные SSL-сертификаты Proxmox" - type = bool - default = true -} - -variable "proxmox_node" { - description = "Имя ноды Proxmox" - type = string - default = "pve" -} - -variable "ssh_public_keys" { - description = "Список публичных SSH-ключей для доступа к создаваемым контейнерам" - type = list(string) - default = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF/yxhAs022l/8FlPlhyi7NeF3CvVGsev3B1HtKICO7M root_from_windows", - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEpwqB40k8QQq3k8160gfMKDaCJCX9qzvmuijfe3mO4I gitea-runner" - ] -}