From e3b8f56ff8b48f28ed5b58fdcb38c301b8fbe6a4 Mon Sep 17 00:00:00 2001 From: karpenok Date: Sun, 8 Nov 2026 17:17:27 +0700 Subject: [PATCH] revert: return to clean state after successful NetBird installation (remove vault and bitwarden) --- .gitea/docker/runner/Dockerfile | 3 --- .gitea/workflows/netbird-install.yml | 13 +------------ inventories/prod/group_vars/all.yml | 3 --- requirements.yml | 1 - 4 files changed, 1 insertion(+), 19 deletions(-) diff --git a/.gitea/docker/runner/Dockerfile b/.gitea/docker/runner/Dockerfile index dccb501..2e01784 100644 --- a/.gitea/docker/runner/Dockerfile +++ b/.gitea/docker/runner/Dockerfile @@ -10,9 +10,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ sshpass \ ca-certificates \ curl \ - nodejs \ - npm \ - && npm install -g @bitwarden/cli \ && ansible-galaxy collection install ansible.posix community.general \ && rm -rf /var/lib/apt/lists/* diff --git a/.gitea/workflows/netbird-install.yml b/.gitea/workflows/netbird-install.yml index 0da1f11..1b26424 100644 --- a/.gitea/workflows/netbird-install.yml +++ b/.gitea/workflows/netbird-install.yml @@ -19,9 +19,6 @@ jobs: - name: Запустить плейбук NetBird env: RUNNER_SSH_KEY: ${{ secrets.RUNNER_SSH_KEY }} - BW_CLIENTID: ${{ secrets.BW_CLIENTID }} - BW_CLIENTSECRET: ${{ secrets.BW_CLIENTSECRET }} - BW_PASSWORD: ${{ secrets.BW_PASSWORD }} NETBIRD_LETSENCRYPT_EMAIL: ${{ inputs.letsencrypt_email }} run: | set -eu @@ -30,15 +27,6 @@ jobs: exit 1 fi - # Настройка и вход в Bitwarden CLI для получения секретов на лету - bw config server https://pass.gunihome.ru - export BW_CLIENTID="${BW_CLIENTID}" - export BW_CLIENTSECRET="${BW_CLIENTSECRET}" - bw login --apikey - export BW_SESSION=$(bw unlock --passwordenv BW_PASSWORD --raw) - - trap 'rm -f "${HOME}/.ssh/id_ed25519"; bw lock 2>/dev/null || true' EXIT - rm -rf "${HOME}/homelab-infra" git clone https://gitea.gunihome.ru/karpenok/homelab-infra.git "${HOME}/homelab-infra" sha="${GITHUB_SHA:-${GITEA_SHA:-}}" @@ -50,6 +38,7 @@ jobs: 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" diff --git a/inventories/prod/group_vars/all.yml b/inventories/prod/group_vars/all.yml index 3dccc93..f30be1c 100644 --- a/inventories/prod/group_vars/all.yml +++ b/inventories/prod/group_vars/all.yml @@ -3,6 +3,3 @@ admin_email: vvkarpenok@gmail.com letsencrypt_email: "{{ admin_email }}" -# Получение секретов на лету напрямую из Vaultwarden (Bitwarden) -netbird_setup_key: "{{ lookup('community.general.bitwarden', 'netbird', field='setup_key') }}" -netbird_api_token: "{{ lookup('community.general.bitwarden', 'netbird', field='api_token') }}" diff --git a/requirements.yml b/requirements.yml index b4f28e4..2588e9a 100644 --- a/requirements.yml +++ b/requirements.yml @@ -1,5 +1,4 @@ --- collections: - name: ansible.posix - - name: community.general