diff --git a/.gitea/workflows/ansible-core-net.yml b/.gitea/workflows/ansible-core-net.yml index 4b25b3e..d752acd 100644 --- a/.gitea/workflows/ansible-core-net.yml +++ b/.gitea/workflows/ansible-core-net.yml @@ -41,12 +41,6 @@ jobs: --client-secret="${INFISICAL_CLIENT_SECRET}" \ --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 eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/ci-cd" --format=dotenv-export --silent)" diff --git a/.gitea/workflows/netbird-install.yml b/.gitea/workflows/netbird-install.yml index 61ca85f..7f34f67 100644 --- a/.gitea/workflows/netbird-install.yml +++ b/.gitea/workflows/netbird-install.yml @@ -54,17 +54,6 @@ jobs: chmod 600 "${HOME}/.ssh/id_ed25519" 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 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:-}" diff --git a/ansible/roles/host/tasks/main.yml b/ansible/roles/host/tasks/main.yml index 7188153..f053ac1 100644 --- a/ansible/roles/host/tasks/main.yml +++ b/ansible/roles/host/tasks/main.yml @@ -58,7 +58,7 @@ ansible.builtin.apt: name: - docker.io - - docker-compose-v2 + - docker-compose - ufw - ca-certificates - curl