diff --git a/ansible/roles/core-net/remnawave/templates/bootstrap-panel.sh.j2 b/ansible/roles/core-net/remnawave/templates/bootstrap-panel.sh.j2 index 65765f5..8f33e05 100644 --- a/ansible/roles/core-net/remnawave/templates/bootstrap-panel.sh.j2 +++ b/ansible/roles/core-net/remnawave/templates/bootstrap-panel.sh.j2 @@ -117,11 +117,14 @@ pub="" if [ -z "${profile_uuid}" ]; then key_resp=$(api GET /system/tools/x25519/generate 2>/dev/null || echo '{}') + # v3: {response:{keypairs:[{publicKey,privateKey},...]}} priv=$(printf '%s' "${key_resp}" | jq -r ' - .response.privateKey // .response.privKey // .privateKey // .privKey // empty') + .response.keypairs[0].privateKey + // .response.privateKey // .response.privKey // .privateKey // .privKey // empty') pub=$(printf '%s' "${key_resp}" | jq -r ' - .response.publicKey // .response.pubKey // .publicKey // .pubKey // empty') - if [ -z "${priv}" ]; then + .response.keypairs[0].publicKey + // .response.publicKey // .response.pubKey // .publicKey // .pubKey // empty') + if [ -z "${priv}" ] || [ -z "${pub}" ]; then echo "Не удалось сгенерировать X25519 ключи Reality" >&2 printf '%s\n' "${key_resp}" >&2 exit 1