fix(ger-nod-02): пароль как у central, HTTP-01 без ACME TXT, кавычки SECRET_KEY
ansible-rus-central / deploy (push) Canceled after 0s
ansible-opnsense / deploy (push) Canceled after 0s
ansible-core-secrets / deploy (push) Canceled after 0s
ansible-core-net / deploy (push) Canceled after 0s
ansible-core-mon / deploy (push) Canceled after 24s
ansible-ger-nod-02 / deploy (push) Successful in 4m1s
ansible-rus-central / deploy (push) Canceled after 0s
ansible-opnsense / deploy (push) Canceled after 0s
ansible-core-secrets / deploy (push) Canceled after 0s
ansible-core-net / deploy (push) Canceled after 0s
ansible-core-mon / deploy (push) Canceled after 24s
ansible-ger-nod-02 / deploy (push) Successful in 4m1s
Падение было на :443 — SECRET_KEY без кавычек ломал ноду. DNS-01 убран: LE через standalone HTTP-01, старые _acme-challenge чистим. ansible_password только из /VPS; host в плейбуке как у rus-central. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
0f7fe4e352
commit
0a56b935de
5 files changed
+82
-35
No files matched your search
@@ -106,9 +106,9 @@ case "$machine" in
|
||||
ger-nod-02)
|
||||
# SECRET_KEY ноды — /services/remnawave (пишет ansible-core-net).
|
||||
eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/remnawave" --format=dotenv-export --silent)"
|
||||
# Пароль VPS — /VPS (не /services/remnawave).
|
||||
# Стартовый пароль VPS — как ansible_password у rus-central, только из Infisical /VPS.
|
||||
eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/VPS" --format=dotenv-export --silent)"
|
||||
# CLOUDFLARE_API уже из /ci-cd выше; отдельной папки /services/cloudflare нет.
|
||||
# CLOUDFLARE_API уже из /ci-cd выше (только A-запись, без DNS-01).
|
||||
export REMNANODE_SECRET_KEY="${REMNANODE_SECRET_KEY:-}"
|
||||
export CLOUDFLARE_API="${CLOUDFLARE_API:-}"
|
||||
export PASS_GER_NOD_02="${PASS_GER_NOD_02:-}"
|
||||
@@ -124,20 +124,15 @@ case "$machine" in
|
||||
echo "В Infisical (/VPS) нет PASS_GER_NOD_02 — нужен для первичного SSH на ger-nod-02" >&2
|
||||
exit 1
|
||||
fi
|
||||
# sshpass нужен для первичного входа по паролю
|
||||
# sshpass — как при первом прогоне rus-central с ansible_password.
|
||||
if ! command -v sshpass >/dev/null 2>&1; then
|
||||
apt-get update -qq && DEBIAN_FRONTEND=noninteractive apt-get install -y -qq sshpass >/dev/null
|
||||
fi
|
||||
# Первичный вход по паролю; после роли host остаётся только ключ раннера.
|
||||
# -e key=value ломает пробелы в ansible_ssh_common_args → JSON через @file.
|
||||
export ANSIBLE_HOST_KEY_CHECKING=False
|
||||
ger_extra=$(mktemp)
|
||||
python3 -c 'import json,os; print(json.dumps({
|
||||
"ansible_password": os.environ["PASS_GER_NOD_02"],
|
||||
"ansible_ssh_common_args": "-o PreferredAuthentications=publickey,password -o StrictHostKeyChecking=accept-new",
|
||||
}))' >"$ger_extra"
|
||||
python3 -c 'import json,os; print(json.dumps({"ansible_password": os.environ["PASS_GER_NOD_02"]}))' >"$ger_extra"
|
||||
extra+=(-e "@${ger_extra}")
|
||||
trap 'rm -f "$ger_extra"' EXIT
|
||||
trap 'rm -f "${HOME}/.ssh/id_ed25519" "'"$ger_extra"'"' EXIT
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
Reference in new issue
Block a user