Compare commits

...
2 Commits
6 changed files with 19 additions and 31 deletions

No files matched your search

+3
View File
@@ -10,6 +10,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
sshpass \ sshpass \
ca-certificates \ ca-certificates \
curl \ curl \
nodejs \
npm \
&& npm install -g @bitwarden/cli \
&& ansible-galaxy collection install ansible.posix community.general \ && ansible-galaxy collection install ansible.posix community.general \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
+12 -12
View File
@@ -19,7 +19,9 @@ jobs:
- name: Запустить плейбук NetBird - name: Запустить плейбук NetBird
env: env:
RUNNER_SSH_KEY: ${{ secrets.RUNNER_SSH_KEY }} RUNNER_SSH_KEY: ${{ secrets.RUNNER_SSH_KEY }}
ANSIBLE_VAULT_PASSWORD: ${{ secrets.ANSIBLE_VAULT_PASSWORD }} BW_CLIENTID: ${{ secrets.BW_CLIENTID }}
BW_CLIENTSECRET: ${{ secrets.BW_CLIENTSECRET }}
BW_PASSWORD: ${{ secrets.BW_PASSWORD }}
NETBIRD_LETSENCRYPT_EMAIL: ${{ inputs.letsencrypt_email }} NETBIRD_LETSENCRYPT_EMAIL: ${{ inputs.letsencrypt_email }}
run: | run: |
set -eu set -eu
@@ -28,6 +30,15 @@ jobs:
exit 1 exit 1
fi 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" rm -rf "${HOME}/homelab-infra"
git clone https://gitea.gunihome.ru/karpenok/homelab-infra.git "${HOME}/homelab-infra" git clone https://gitea.gunihome.ru/karpenok/homelab-infra.git "${HOME}/homelab-infra"
sha="${GITHUB_SHA:-${GITEA_SHA:-}}" sha="${GITHUB_SHA:-${GITEA_SHA:-}}"
@@ -40,16 +51,6 @@ jobs:
printf '%s\n' "${RUNNER_SSH_KEY}" > "${HOME}/.ssh/id_ed25519" printf '%s\n' "${RUNNER_SSH_KEY}" > "${HOME}/.ssh/id_ed25519"
chmod 600 "${HOME}/.ssh/id_ed25519" chmod 600 "${HOME}/.ssh/id_ed25519"
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" cd "${HOME}/homelab-infra"
extra_args=() extra_args=()
@@ -61,5 +62,4 @@ jobs:
-i inventories/prod/hosts.yml \ -i inventories/prod/hosts.yml \
--limit netbird \ --limit netbird \
--private-key "${HOME}/.ssh/id_ed25519" \ --private-key "${HOME}/.ssh/id_ed25519" \
"${vault_args[@]}" \
"${extra_args[@]}" "${extra_args[@]}"
-1
View File
@@ -3,7 +3,6 @@ inventory = inventories/prod/hosts.yml
roles_path = roles roles_path = roles
retry_files_enabled = false retry_files_enabled = false
stdout_callback = default stdout_callback = default
vault_password_file = ~/.ansible/vault_pass
[ssh_connection] [ssh_connection]
pipelining = True pipelining = True
+3 -17
View File
@@ -3,20 +3,6 @@
admin_email: vvkarpenok@gmail.com admin_email: vvkarpenok@gmail.com
letsencrypt_email: "{{ admin_email }}" letsencrypt_email: "{{ admin_email }}"
netbird_setup_key: !vault | # Получение секретов на лету напрямую из Vaultwarden (Bitwarden)
$ANSIBLE_VAULT;1.1;AES256 netbird_setup_key: "{{ lookup('community.general.bitwarden', 'netbird', field='setup_key') }}"
31333566316136663536613734626334393130666566616662613833383430336634303939303865 netbird_api_token: "{{ lookup('community.general.bitwarden', 'netbird', field='api_token') }}"
6337613039623663613538636566376232656666303162330a666231343232346132373734343465
65306462373635303366663234353530306438643835306463613239666263376564363532363066
6533316330366236660a333763616137326534666462393761306265396464313138613839363237
62613262313832653266303930656566396134376539633231656133396130663034333735653930
6563353433626439643237663466386134663137343639336439
netbird_api_token: !vault |
$ANSIBLE_VAULT;1.1;AES256
34646461353136653335666562316533633239383365316639383430333962393762373537346533
3537663566653361343134306263396164346238356339350a383732393761383365663565626266
65626533616537316235306235373666383632626534326436393665626665333736633963646164
3436353563656466350a663938383736663064313133303935653261373361336166333661316638
38333735656263326237326465353766393232663630373861393730633164616432346434303833
3634303964643839333533313039326334373738363565363165
-1
View File
@@ -7,7 +7,6 @@ all:
rus-central: rus-central:
ansible_host: 45.154.185.208 ansible_host: 45.154.185.208
ansible_user: root ansible_user: root
ansible_password: AUG1HiRoeCBpn9
netbird: netbird:
hosts: hosts:
rus-central: rus-central:
+1
View File
@@ -1,4 +1,5 @@
--- ---
collections: collections:
- name: ansible.posix - name: ansible.posix
- name: community.general