From f9fc058b1a1c898e61a096dfba0d96b2e582d336 Mon Sep 17 00:00:00 2001 From: karpenok Date: Wed, 11 Nov 2026 22:18:52 +0700 Subject: [PATCH] fix(remnawave): ensure Infisical folder exists before writing secrets Create /services/remnawave if missing and pass INFISICAL_* into delegated localhost tasks explicitly. Co-authored-by: Cursor --- .../roles/core-net/remnawave/tasks/main.yml | 42 +++++++++++++++++-- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/ansible/roles/core-net/remnawave/tasks/main.yml b/ansible/roles/core-net/remnawave/tasks/main.yml index 6972921..f87fbd9 100644 --- a/ansible/roles/core-net/remnawave/tasks/main.yml +++ b/ansible/roles/core-net/remnawave/tasks/main.yml @@ -57,10 +57,31 @@ mode: "0600" no_log: true +- name: Создать папку /services/remnawave в Infisical при необходимости + ansible.builtin.shell: | + set -euo pipefail + infisical secrets folders create \ + --domain="${INFISICAL_DOMAIN}" \ + --token="${INFISICAL_TOKEN}" \ + --env=prod \ + --projectId="${INFISICAL_PROJECT_ID}" \ + --path="/services" \ + --name="remnawave" \ + --silent 2>/dev/null || true + args: + executable: /bin/bash + delegate_to: localhost + become: false + environment: + INFISICAL_DOMAIN: "{{ lookup('env', 'INFISICAL_DOMAIN') }}" + INFISICAL_TOKEN: "{{ lookup('env', 'INFISICAL_TOKEN') }}" + INFISICAL_PROJECT_ID: "{{ lookup('env', 'INFISICAL_PROJECT_ID') }}" + changed_when: false + - name: Сохранить сгенерированные секреты панели в Infisical ansible.builtin.shell: | set -euo pipefail - infisical secrets set \ + out=$(infisical secrets set \ --domain="${INFISICAL_DOMAIN}" \ --token="${INFISICAL_TOKEN}" \ --env=prod \ @@ -70,12 +91,18 @@ "REMNAWAVE_POSTGRES_PASSWORD=${RW_PG_PASS}" \ "REMNAWAVE_METRICS_PASS=${RW_METRICS_PASS}" \ "REMNAWAVE_WEBHOOK_SECRET_HEADER=${RW_WEBHOOK}" \ - --silent + --silent 2>&1) || { + echo "infisical secrets set failed: ${out}" >&2 + exit 1 + } args: executable: /bin/bash delegate_to: localhost become: false environment: + INFISICAL_DOMAIN: "{{ lookup('env', 'INFISICAL_DOMAIN') }}" + INFISICAL_TOKEN: "{{ lookup('env', 'INFISICAL_TOKEN') }}" + INFISICAL_PROJECT_ID: "{{ lookup('env', 'INFISICAL_PROJECT_ID') }}" RW_APP_SECRET: "{{ remnawave_app_secret }}" RW_PG_PASS: "{{ remnawave_postgres_password }}" RW_METRICS_PASS: "{{ remnawave_metrics_pass }}" @@ -83,6 +110,7 @@ when: >- remnawave_need_app_secret or remnawave_need_postgres_password or remnawave_need_metrics_pass or remnawave_need_webhook_secret + register: remnawave_infisical_panel_secrets changed_when: true no_log: true @@ -174,19 +202,25 @@ if [ -n "${RW_NODE_SECRET}" ]; then args+=("REMNANODE_SECRET_KEY=${RW_NODE_SECRET}") fi - infisical secrets set \ + out=$(infisical secrets set \ --domain="${INFISICAL_DOMAIN}" \ --token="${INFISICAL_TOKEN}" \ --env=prod \ --projectId="${INFISICAL_PROJECT_ID}" \ --path="/services/remnawave" \ "${args[@]}" \ - --silent + --silent 2>&1) || { + echo "infisical secrets set failed: ${out}" >&2 + exit 1 + } args: executable: /bin/bash delegate_to: localhost become: false environment: + INFISICAL_DOMAIN: "{{ lookup('env', 'INFISICAL_DOMAIN') }}" + INFISICAL_TOKEN: "{{ lookup('env', 'INFISICAL_TOKEN') }}" + INFISICAL_PROJECT_ID: "{{ lookup('env', 'INFISICAL_PROJECT_ID') }}" RW_API_TOKEN: "{{ remnawave_api_token }}" RW_NODE_SECRET: "{{ remnawave_bootstrap.node_secret | default('') }}" when: >-