feat(secrets): integrate Infisical Universal Auth into Gitea Actions workflows
- Configure Infisical CLI authentication via INFISICAL_CLIENT_ID and INFISICAL_CLIENT_SECRET - Fetch runner SSH keys and state tokens dynamically from /ci-cd - Fetch Proxmox target endpoints and tokens dynamically from /proxmox/<TARGET> - Remove plaintext secrets from Ansible core_secrets defaults - Clean up obsolete files and add --remove-orphans to docker compose invocations
This commit is contained in:
1 parent
efc23dfac2
commit
d2888c1149
14 files changed
+124
-70
No files matched your search
Whitespace-only changes.
@@ -18,11 +18,33 @@ jobs:
|
||||
steps:
|
||||
- name: Деплой Traefik на core-net через Ansible
|
||||
env:
|
||||
RUNNER_SSH_KEY: ${{ secrets.RUNNER_SSH_KEY }}
|
||||
INFISICAL_CLIENT_ID: ${{ secrets.INFISICAL_CLIENT_ID }}
|
||||
INFISICAL_CLIENT_SECRET: ${{ secrets.INFISICAL_CLIENT_SECRET }}
|
||||
run: |
|
||||
set -eu
|
||||
|
||||
# Направляем домены на актуальный шлюз Traefik (core-net 192.168.1.104)
|
||||
for domain in gitea.gunihome.ru infisical.gunihome.ru; do
|
||||
if ! grep -q "${domain}" /etc/hosts; then
|
||||
echo "192.168.1.104 ${domain}" >> /etc/hosts
|
||||
fi
|
||||
done
|
||||
|
||||
# Авторизация в Infisical и получение SSH-ключа
|
||||
export INFISICAL_PROJECT_ID="806e7f09-5838-492a-946b-2d69b96876ab"
|
||||
export INFISICAL_DOMAIN="https://infisical.gunihome.ru/api"
|
||||
|
||||
infisical login \
|
||||
--domain="${INFISICAL_DOMAIN}" \
|
||||
--method=universal-auth \
|
||||
--client-id="${INFISICAL_CLIENT_ID}" \
|
||||
--client-secret="${INFISICAL_CLIENT_SECRET}" \
|
||||
--silent
|
||||
|
||||
eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/ci-cd" --format=dotenv-export --silent)"
|
||||
|
||||
if [ -z "${RUNNER_SSH_KEY:-}" ]; then
|
||||
echo "В секретах Gitea отсутствует RUNNER_SSH_KEY" >&2
|
||||
echo "В Infisical (/ci-cd) отсутствует RUNNER_SSH_KEY" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
@@ -18,11 +18,41 @@ jobs:
|
||||
steps:
|
||||
- name: Деплой core-secrets через Ansible
|
||||
env:
|
||||
RUNNER_SSH_KEY: ${{ secrets.RUNNER_SSH_KEY }}
|
||||
INFISICAL_CLIENT_ID: ${{ secrets.INFISICAL_CLIENT_ID }}
|
||||
INFISICAL_CLIENT_SECRET: ${{ secrets.INFISICAL_CLIENT_SECRET }}
|
||||
run: |
|
||||
set -eu
|
||||
|
||||
# Направляем домены на актуальный шлюз Traefik (core-net 192.168.1.104)
|
||||
for domain in gitea.gunihome.ru infisical.gunihome.ru; do
|
||||
if ! grep -q "${domain}" /etc/hosts; then
|
||||
echo "192.168.1.104 ${domain}" >> /etc/hosts
|
||||
fi
|
||||
done
|
||||
|
||||
# Авторизация в Infisical
|
||||
export INFISICAL_PROJECT_ID="806e7f09-5838-492a-946b-2d69b96876ab"
|
||||
export INFISICAL_DOMAIN="https://infisical.gunihome.ru/api"
|
||||
|
||||
infisical login \
|
||||
--domain="${INFISICAL_DOMAIN}" \
|
||||
--method=universal-auth \
|
||||
--client-id="${INFISICAL_CLIENT_ID}" \
|
||||
--client-secret="${INFISICAL_CLIENT_SECRET}" \
|
||||
--silent
|
||||
|
||||
# Подтягиваем SSH-ключ раннера из /ci-cd
|
||||
eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/ci-cd" --format=dotenv-export --silent)"
|
||||
|
||||
# Подтягиваем ключи infisical из /services/infisical
|
||||
eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --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 "В секретах Gitea отсутствует RUNNER_SSH_KEY" >&2
|
||||
echo "В Infisical (/ci-cd) отсутствует RUNNER_SSH_KEY" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
@@ -18,17 +18,39 @@ jobs:
|
||||
steps:
|
||||
- name: Запустить плейбук NetBird
|
||||
env:
|
||||
RUNNER_SSH_KEY: ${{ secrets.RUNNER_SSH_KEY }}
|
||||
INFISICAL_CLIENT_ID: ${{ secrets.INFISICAL_CLIENT_ID }}
|
||||
INFISICAL_CLIENT_SECRET: ${{ secrets.INFISICAL_CLIENT_SECRET }}
|
||||
NETBIRD_LETSENCRYPT_EMAIL: ${{ inputs.letsencrypt_email }}
|
||||
run: |
|
||||
set -eu
|
||||
if [ -z "${RUNNER_SSH_KEY}" ]; then
|
||||
echo "В секретах нет RUNNER_SSH_KEY." >&2
|
||||
|
||||
# Направляем домены на актуальный шлюз Traefik (core-net 192.168.1.104)
|
||||
for domain in gitea.gunihome.ru infisical.gunihome.ru; do
|
||||
if ! grep -q "${domain}" /etc/hosts; then
|
||||
echo "192.168.1.104 ${domain}" >> /etc/hosts
|
||||
fi
|
||||
done
|
||||
|
||||
# Авторизация в Infisical и получение SSH-ключа
|
||||
export INFISICAL_PROJECT_ID="806e7f09-5838-492a-946b-2d69b96876ab"
|
||||
export INFISICAL_DOMAIN="https://infisical.gunihome.ru/api"
|
||||
|
||||
infisical login \
|
||||
--domain="${INFISICAL_DOMAIN}" \
|
||||
--method=universal-auth \
|
||||
--client-id="${INFISICAL_CLIENT_ID}" \
|
||||
--client-secret="${INFISICAL_CLIENT_SECRET}" \
|
||||
--silent
|
||||
|
||||
eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --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
|
||||
|
||||
rm -rf "${HOME}/homelab-infra"
|
||||
git clone https://gitea.gunihome.ru/karpenok/homelab-infra.git "${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}"
|
||||
@@ -40,6 +62,7 @@ jobs:
|
||||
chmod 600 "${HOME}/.ssh/id_ed25519"
|
||||
trap 'rm -f "${HOME}/.ssh/id_ed25519"' EXIT
|
||||
|
||||
export ANSIBLE_HOST_KEY_CHECKING=False
|
||||
cd "${HOME}/homelab-infra/ansible"
|
||||
|
||||
extra_args=()
|
||||
|
||||
@@ -31,19 +31,39 @@ jobs:
|
||||
env:
|
||||
TARGET: ${{ inputs.target }}
|
||||
ACTION: ${{ inputs.action }}
|
||||
TF_VAR_proxmox_endpoint: ${{ inputs.target == 'netcore' && (secrets.NETCORE_ENDPOINT || 'https://192.168.1.100:8006/') || (secrets.PVE_ENDPOINT || 'https://192.168.1.2:8006/') }}
|
||||
TF_VAR_proxmox_api_token: ${{ inputs.target == 'netcore' && secrets.NETCORE_API_TOKEN || secrets.PVE_API_TOKEN }}
|
||||
RUNNER_SSH_KEY: ${{ secrets.RUNNER_SSH_KEY }}
|
||||
GITEA_TOKEN: ${{ secrets.TF_STATE_TOKEN }}
|
||||
INFISICAL_CLIENT_ID: ${{ secrets.INFISICAL_CLIENT_ID }}
|
||||
INFISICAL_CLIENT_SECRET: ${{ secrets.INFISICAL_CLIENT_SECRET }}
|
||||
run: |
|
||||
set -eu
|
||||
|
||||
# Направляем gitea.gunihome.ru на актуальный шлюз Traefik (core-net 192.168.1.104)
|
||||
if ! grep -q "gitea.gunihome.ru" /etc/hosts; then
|
||||
echo "192.168.1.104 gitea.gunihome.ru" >> /etc/hosts
|
||||
else
|
||||
sed -i 's/192.168.1.201/192.168.1.104/g' /etc/hosts
|
||||
fi
|
||||
# Направляем домены на актуальный шлюз Traefik (core-net 192.168.1.104)
|
||||
for domain in gitea.gunihome.ru infisical.gunihome.ru; do
|
||||
if ! grep -q "${domain}" /etc/hosts; then
|
||||
echo "192.168.1.104 ${domain}" >> /etc/hosts
|
||||
else
|
||||
sed -i "s/192.168.1.201/192.168.1.104/g" /etc/hosts
|
||||
fi
|
||||
done
|
||||
|
||||
# Авторизация в Infisical и экспорт секретов окружения
|
||||
export INFISICAL_PROJECT_ID="806e7f09-5838-492a-946b-2d69b96876ab"
|
||||
export INFISICAL_DOMAIN="https://infisical.gunihome.ru/api"
|
||||
|
||||
infisical login \
|
||||
--domain="${INFISICAL_DOMAIN}" \
|
||||
--method=universal-auth \
|
||||
--client-id="${INFISICAL_CLIENT_ID}" \
|
||||
--client-secret="${INFISICAL_CLIENT_SECRET}" \
|
||||
--silent
|
||||
|
||||
# Подтягиваем SSH-ключ раннера и токен Gitea State Backend из /ci-cd
|
||||
eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/ci-cd" --format=dotenv-export --silent)"
|
||||
# Подтягиваем эндпоинт и API-токен целевого гипервизора из /proxmox/<TARGET>
|
||||
eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/proxmox/${TARGET}" --format=dotenv-export --silent)"
|
||||
|
||||
export TF_VAR_proxmox_endpoint="${PROXMOX_ENDPOINT}"
|
||||
export TF_VAR_proxmox_api_token="${PROXMOX_API_TOKEN}"
|
||||
export GITEA_TOKEN="${TF_STATE_TOKEN}"
|
||||
|
||||
rm -rf "${HOME}/homelab-infra"
|
||||
# Клонируем по прямому IP Gitea, чтобы не зависеть от внешних факторов
|
||||
|
||||
@@ -1,3 +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
|
||||
@@ -4,4 +4,3 @@ traefik_dir: "/opt/traefik"
|
||||
traefik_dynamic_dir: "/opt/traefik/dynamic"
|
||||
traefik_log_dir: "/var/log/traefik"
|
||||
traefik_acme_email: "vvkarpenok@gmail.com"
|
||||
traefik_dashboard_auth: 'karpenok:$apr1$dYhfMHp0$/xqbASu5jj55Ev058YImp.'
|
||||
@@ -1,15 +0,0 @@
|
||||
http:
|
||||
routers:
|
||||
test:
|
||||
rule: "Host(`test.gunihome.ru`)"
|
||||
entryPoints:
|
||||
- websecure
|
||||
service: test
|
||||
tls:
|
||||
certResolver: letsencrypt
|
||||
|
||||
services:
|
||||
test:
|
||||
loadBalancer:
|
||||
servers:
|
||||
- url: "http://192.168.1.228:8317"
|
||||
@@ -1,4 +1,4 @@
|
||||
---
|
||||
- name: Перезапустить Traefik
|
||||
ansible.builtin.command: docker compose -f {{ traefik_dir }}/compose.yaml restart
|
||||
ansible.builtin.command: docker compose -f {{ traefik_dir }}/compose.yaml up -d --force-recreate --remove-orphans
|
||||
changed_when: true
|
||||
@@ -84,6 +84,6 @@
|
||||
when: item.path | basename not in repo_files
|
||||
|
||||
- name: Запустить Traefik через Docker Compose
|
||||
ansible.builtin.command: docker compose -f {{ traefik_dir }}/compose.yaml up -d
|
||||
ansible.builtin.command: docker compose -f {{ traefik_dir }}/compose.yaml up -d --remove-orphans
|
||||
register: compose_up
|
||||
changed_when: "'Started' in compose_up.stdout or 'Running' in compose_up.stdout or 'Created' in compose_up.stdout"
|
||||
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"
|
||||
@@ -10,8 +10,8 @@ vaultwarden_domain: "https://pass.gunihome.ru"
|
||||
infisical_site_url: "https://infisical.gunihome.ru"
|
||||
|
||||
infisical_postgres_user: "infisical"
|
||||
infisical_postgres_password: "Vrl2cqlvXNGtf5h8WOT5eqPsgLmHJJCt"
|
||||
infisical_postgres_password: "{{ lookup('env', 'INFISICAL_POSTGRES_PASSWORD') }}"
|
||||
infisical_postgres_db: "infisical"
|
||||
infisical_encryption_key: "20e2553f18b49f077441eaf7699c1d18"
|
||||
infisical_auth_secret: "j+n6OqMIZpsnhS1QoHeHa4orTh6CBEDln7SzqDa826U="
|
||||
infisical_encryption_key: "{{ lookup('env', 'INFISICAL_ENCRYPTION_KEY') }}"
|
||||
infisical_auth_secret: "{{ lookup('env', 'INFISICAL_AUTH_SECRET') }}"
|
||||
|
||||
@@ -33,8 +33,6 @@
|
||||
- "{{ secrets_dir }}"
|
||||
- "{{ vaultwarden_data_dir }}"
|
||||
- "{{ infisical_data_dir }}"
|
||||
- "{{ infisical_data_dir }}/db"
|
||||
- "{{ infisical_data_dir }}/redis"
|
||||
|
||||
- name: Установить compose.yaml для core-secrets
|
||||
ansible.builtin.template:
|
||||
@@ -45,6 +43,6 @@
|
||||
mode: "0640"
|
||||
|
||||
- name: Запустить сервисы core-secrets через Docker Compose
|
||||
ansible.builtin.command: docker compose -f {{ secrets_dir }}/compose.yaml up -d
|
||||
ansible.builtin.command: docker compose -f {{ secrets_dir }}/compose.yaml up -d --remove-orphans
|
||||
register: compose_up
|
||||
changed_when: "'Started' in compose_up.stdout or 'Running' in compose_up.stdout or 'Created' in compose_up.stdout or 'Pulled' in compose_up.stdout"
|
||||
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"
|
||||
@@ -5,7 +5,7 @@ services:
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
- DOMAIN={{ vaultwarden_domain }}
|
||||
- SIGNUPS_ALLOWED=true
|
||||
- SIGNUPS_ALLOWED=false
|
||||
- INVITATIONS_ALLOWED=true
|
||||
- SHOW_PASSWORD_HINT=false
|
||||
- WEBSOCKET_ENABLED=true
|
||||
|
||||
Generated
-25
@@ -1,25 +0,0 @@
|
||||
# This file is maintained automatically by "terraform init".
|
||||
# Manual edits may be lost in future updates.
|
||||
|
||||
provider "registry.terraform.io/bpg/proxmox" {
|
||||
version = "0.70.1"
|
||||
constraints = "~> 0.70.0"
|
||||
hashes = [
|
||||
"h1:vd6g2B0GKtx5Q6XsJ34QzUMZMN89+wo6Z92/+eO3rjE=",
|
||||
"zh:1f3ca7b12fad410a3689e30f058ce210a8f4e5a13b25c5862acb62c9a6859cd5",
|
||||
"zh:2669b0548f039e874a9f84362960fb5a479144a9c5bd3c1626b3aa9ec2b41e26",
|
||||
"zh:313be32be4665f0d170b4065d57e530486b575081be1e27d793c6c9ac6bb1d42",
|
||||
"zh:360ace6cffba80029a14a3b155a9ffe6c55419236e6b933c011edee1c2e5fc60",
|
||||
"zh:3bc6e7617ba7ed1db1a3c89242714a1a4484ead154784a8fa62633124e8ebfaa",
|
||||
"zh:3cc33cedb2bafff05ddf293525e1251ea82480e8298b3bfe51a75fc0ab2e53a7",
|
||||
"zh:61fba29acaed2382f58af39c920207f8d2e62f1be79caa5ef9fa5b60bd90c740",
|
||||
"zh:97d1495869da236220168c818496a4b49576fab29ff7a031e41baafc82e767b6",
|
||||
"zh:9ef6047197682930c8144b1faeeeb42247bf1b07048a6ac37ff18e7965df40fd",
|
||||
"zh:b30d58f33159028ab9e1d62353df9443efacd920497636c573d20beb3ad6aae0",
|
||||
"zh:bf931b6de0ceae50a82183ca23a314f646068495514f27fb78a9ca66b2275ad3",
|
||||
"zh:e071099e8ae796a1a57ac55b3340ede4b497c2666b12a84809c3df0c7a851a42",
|
||||
"zh:e35790628fd80ff201292765e28db9cacc0db194df884d37bc5bac52ed86113c",
|
||||
"zh:f26e0763dbe6a6b2195c94b44696f2110f7f55433dc142839be16b9697fa5597",
|
||||
"zh:f2ae152820737ca4435c0a96c74dd84fea2e0fa90a53c52658d1d3c5598af2aa",
|
||||
]
|
||||
}
|
||||
Reference in new issue
Block a user