From d4e0470a499f198f21ef57a90c4d5aa6c51dcdb3 Mon Sep 17 00:00:00 2001 From: karpenok Date: Sun, 8 Nov 2026 15:23:30 +0700 Subject: [PATCH] =?UTF-8?q?feat(vault):=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B9?= =?UTF-8?q?=D1=82=D0=B8=20=D0=BD=D0=B0=20Ansible=20Vault=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20=D1=85=D1=80=D0=B0=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F=20?= =?UTF-8?q?=D1=81=D0=B5=D0=BA=D1=80=D0=B5=D1=82=D0=BE=D0=B2=20=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=D0=B5=D0=BA=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/netbird-install.yml | 13 ++++++++++++- ansible.cfg | 1 + inventories/prod/group_vars/{ => all}/all.yml | 4 ++++ inventories/prod/group_vars/all/vault.yml | 12 ++++++++++++ 4 files changed, 29 insertions(+), 1 deletion(-) rename inventories/prod/group_vars/{ => all}/all.yml (54%) create mode 100644 inventories/prod/group_vars/all/vault.yml diff --git a/.gitea/workflows/netbird-install.yml b/.gitea/workflows/netbird-install.yml index 1b26424..49f9292 100644 --- a/.gitea/workflows/netbird-install.yml +++ b/.gitea/workflows/netbird-install.yml @@ -19,6 +19,7 @@ jobs: - name: Запустить плейбук NetBird env: RUNNER_SSH_KEY: ${{ secrets.RUNNER_SSH_KEY }} + ANSIBLE_VAULT_PASSWORD: ${{ secrets.ANSIBLE_VAULT_PASSWORD }} NETBIRD_LETSENCRYPT_EMAIL: ${{ inputs.letsencrypt_email }} run: | set -eu @@ -38,7 +39,16 @@ 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 + + vault_args=() + if [ -n "${ANSIBLE_VAULT_PASSWORD:-}" ]; then + printf '%s\n' "${ANSIBLE_VAULT_PASSWORD}" > "${HOME}/.vault_pass" + chmod 600 "${HOME}/.vault_pass" + vault_args+=(--vault-password-file "${HOME}/.vault_pass") + trap 'rm -f "${HOME}/.ssh/id_ed25519" "${HOME}/.vault_pass"' EXIT + else + trap 'rm -f "${HOME}/.ssh/id_ed25519"' EXIT + fi cd "${HOME}/homelab-infra" @@ -51,4 +61,5 @@ jobs: -i inventories/prod/hosts.yml \ --limit netbird \ --private-key "${HOME}/.ssh/id_ed25519" \ + "${vault_args[@]}" \ "${extra_args[@]}" diff --git a/ansible.cfg b/ansible.cfg index 9ebbd53..5b6e29d 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -3,6 +3,7 @@ inventory = inventories/prod/hosts.yml roles_path = roles retry_files_enabled = false stdout_callback = default +vault_password_file = ~/.ansible/vault_pass [ssh_connection] pipelining = True diff --git a/inventories/prod/group_vars/all.yml b/inventories/prod/group_vars/all/all.yml similarity index 54% rename from inventories/prod/group_vars/all.yml rename to inventories/prod/group_vars/all/all.yml index f30be1c..b79b2fd 100644 --- a/inventories/prod/group_vars/all.yml +++ b/inventories/prod/group_vars/all/all.yml @@ -3,3 +3,7 @@ admin_email: vvkarpenok@gmail.com letsencrypt_email: "{{ admin_email }}" +# Ссылки на зашифрованные секреты из vault.yml +netbird_setup_key: "{{ vault_netbird_setup_key }}" +netbird_api_token: "{{ vault_netbird_api_token }}" + diff --git a/inventories/prod/group_vars/all/vault.yml b/inventories/prod/group_vars/all/vault.yml new file mode 100644 index 0000000..9698c9e --- /dev/null +++ b/inventories/prod/group_vars/all/vault.yml @@ -0,0 +1,12 @@ +$ANSIBLE_VAULT;1.1;AES256 +33333539643065346131616361353734323332373633333637366361336636316463323464386362 +3361616338386330616436336264383030343165383331330a656466666236373565616535653934 +62633162333361643330346437613832373736393261626663373364323065633932333262373733 +6631656561323131360a393663313736376531656264626339303064613439386438653133376566 +61376636316537316336623730646565626364656538356333386131383233323736653830646635 +66633931646261333461333139386635653034616638323637373435366534333962656465613563 +36636661303930626634386333373032373665376661363765343733336533656437326665386636 +64663161363962336132373830323234636532613163623936303064323138303138643339333438 +62363731663361323832373263326434626638663463666133316566393936373262633064633634 +61626336313664326366626332353835363835633933646533333433663966373366313634626466 +343230326163363832643830653461383435