diff --git a/ansible/roles/core-net/remnawave/tasks/main.yml b/ansible/roles/core-net/remnawave/tasks/main.yml index c168e23..bd6226f 100644 --- a/ansible/roles/core-net/remnawave/tasks/main.yml +++ b/ansible/roles/core-net/remnawave/tasks/main.yml @@ -114,11 +114,7 @@ RW_PG_PASS: "{{ remnawave_postgres_password }}" RW_METRICS_PASS: "{{ remnawave_metrics_pass }}" RW_WEBHOOK: "{{ remnawave_webhook_secret }}" - when: >- - remnawave_need_admin_password or remnawave_need_app_secret - or remnawave_need_postgres_password or remnawave_need_metrics_pass - or remnawave_need_webhook_secret - register: remnawave_infisical_panel_secrets + # Всегда пишем admin+runtime секреты в /services/remnawave (идемпотентно). changed_when: true no_log: true @@ -202,11 +198,6 @@ failed_when: remnawave_bootstrap_raw.rc != 0 no_log: false -- name: Показать stderr bootstrap при ошибке - ansible.builtin.fail: - msg: "{{ remnawave_bootstrap_raw.stderr | default(remnawave_bootstrap_raw.stdout) | default('bootstrap failed') }}" - when: remnawave_bootstrap_raw.rc != 0 - - name: Разобрать результат bootstrap ansible.builtin.set_fact: remnawave_bootstrap: "{{ remnawave_bootstrap_raw.stdout | from_json }}" 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 fd6ee08..666e198 100644 --- a/ansible/roles/core-net/remnawave/templates/bootstrap-panel.sh.j2 +++ b/ansible/roles/core-net/remnawave/templates/bootstrap-panel.sh.j2 @@ -2,7 +2,8 @@ set -euo pipefail API_BASE="https://${RW_PANEL_DOMAIN}/api" -CURL=(curl -sSk --resolve "${RW_PANEL_DOMAIN}:443:127.0.0.1") +# Admin JWT без X-Remnawave-Client-Type: browser → 403 на всех эндпоинтах (Remnawave ≥3). +CURL=(curl -sSk --resolve "${RW_PANEL_DOMAIN}:443:127.0.0.1" -H "X-Remnawave-Client-Type: browser") AUTH_HDR=() admin_created=0