fix(security): eliminate all plaintext hashes from CI and unify compose package in host role
This commit is contained in:
1 parent
7b38efbd0e
commit
abe9280a30
3 files changed
+1
-18
No files matched your search
@@ -41,12 +41,6 @@ jobs:
|
|||||||
--client-secret="${INFISICAL_CLIENT_SECRET}" \
|
--client-secret="${INFISICAL_CLIENT_SECRET}" \
|
||||||
--plain)
|
--plain)
|
||||||
|
|
||||||
# Проверяем и при необходимости инициализируем TRAEFIK_DASHBOARD_AUTH в /services/traefik
|
|
||||||
if ! infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/traefik" --format=dotenv-export --silent 2>/dev/null | grep -q 'TRAEFIK_DASHBOARD_AUTH'; then
|
|
||||||
infisical secrets-manager folders create traefik --path /services --env prod --projectId "${INFISICAL_PROJECT_ID}" --domain "${INFISICAL_DOMAIN}" --token "${TOKEN}" --silent 2>/dev/null || true
|
|
||||||
infisical secrets set --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/traefik" "TRAEFIK_DASHBOARD_AUTH=karpenok:\$apr1\$dYhfMHp0\$/xqbASu5jj55Ev058YImp." --silent
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Экспорт SSH-ключа раннера из /ci-cd
|
# Экспорт SSH-ключа раннера из /ci-cd
|
||||||
eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/ci-cd" --format=dotenv-export --silent)"
|
eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/ci-cd" --format=dotenv-export --silent)"
|
||||||
|
|
||||||
|
|||||||
@@ -54,17 +54,6 @@ jobs:
|
|||||||
chmod 600 "${HOME}/.ssh/id_ed25519"
|
chmod 600 "${HOME}/.ssh/id_ed25519"
|
||||||
trap 'rm -f "${HOME}/.ssh/id_ed25519"' EXIT
|
trap 'rm -f "${HOME}/.ssh/id_ed25519"' EXIT
|
||||||
|
|
||||||
# Проверяем наличие ключей NetBird в /services/netbird в Infisical.
|
|
||||||
# Если они еще не в Infisical, но есть на рабочем VPS — автоматически переносим их в Infisical.
|
|
||||||
if ! infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/netbird" --format=dotenv-export --silent 2>/dev/null | grep -q 'NETBIRD_AUTH_SECRET'; then
|
|
||||||
infisical secrets-manager folders create netbird --path /services --env prod --projectId "${INFISICAL_PROJECT_ID}" --domain "${INFISICAL_DOMAIN}" --token "${TOKEN}" --silent 2>/dev/null || true
|
|
||||||
if ssh -i "${HOME}/.ssh/id_ed25519" -o StrictHostKeyChecking=no root@45.154.185.208 "test -f /opt/netbird/.env"; then
|
|
||||||
ssh -i "${HOME}/.ssh/id_ed25519" -o StrictHostKeyChecking=no root@45.154.185.208 "cat /opt/netbird/.env" > /tmp/netbird.env
|
|
||||||
infisical secrets set --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/netbird" --file=/tmp/netbird.env --silent
|
|
||||||
rm -f /tmp/netbird.env
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Подтягиваем боевые ключи NetBird из Infisical
|
# Подтягиваем боевые ключи NetBird из Infisical
|
||||||
eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/netbird" --format=dotenv-export --silent)"
|
eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/netbird" --format=dotenv-export --silent)"
|
||||||
export NETBIRD_AUTH_SECRET="${NETBIRD_AUTH_SECRET:-}"
|
export NETBIRD_AUTH_SECRET="${NETBIRD_AUTH_SECRET:-}"
|
||||||
|
|||||||
@@ -58,7 +58,7 @@
|
|||||||
ansible.builtin.apt:
|
ansible.builtin.apt:
|
||||||
name:
|
name:
|
||||||
- docker.io
|
- docker.io
|
||||||
- docker-compose-v2
|
- docker-compose
|
||||||
- ufw
|
- ufw
|
||||||
- ca-certificates
|
- ca-certificates
|
||||||
- curl
|
- curl
|
||||||
|
|||||||
Reference in new issue
Block a user