revert: return to clean state after successful NetBird installation (remove vault and bitwarden)
This commit is contained in:
1 parent
a49f271b4f
commit
e3b8f56ff8
4 files changed
+1
-19
No files matched your search
@@ -10,9 +10,6 @@ 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/*
|
||||||
|
|
||||||
@@ -19,9 +19,6 @@ jobs:
|
|||||||
- name: Запустить плейбук NetBird
|
- name: Запустить плейбук NetBird
|
||||||
env:
|
env:
|
||||||
RUNNER_SSH_KEY: ${{ secrets.RUNNER_SSH_KEY }}
|
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 }}
|
NETBIRD_LETSENCRYPT_EMAIL: ${{ inputs.letsencrypt_email }}
|
||||||
run: |
|
run: |
|
||||||
set -eu
|
set -eu
|
||||||
@@ -30,15 +27,6 @@ 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:-}}"
|
||||||
@@ -50,6 +38,7 @@ jobs:
|
|||||||
install -d -m 700 "${HOME}/.ssh"
|
install -d -m 700 "${HOME}/.ssh"
|
||||||
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"
|
||||||
|
trap 'rm -f "${HOME}/.ssh/id_ed25519"' EXIT
|
||||||
|
|
||||||
cd "${HOME}/homelab-infra"
|
cd "${HOME}/homelab-infra"
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,3 @@
|
|||||||
admin_email: vvkarpenok@gmail.com
|
admin_email: vvkarpenok@gmail.com
|
||||||
letsencrypt_email: "{{ admin_email }}"
|
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') }}"
|
|
||||||
@@ -1,5 +1,4 @@
|
|||||||
---
|
---
|
||||||
collections:
|
collections:
|
||||||
- name: ansible.posix
|
- name: ansible.posix
|
||||||
- name: community.general
|
|
||||||
|
|
||||||
Reference in new issue
Block a user