diff --git a/ansible/roles/core-net/remnawave/tasks/main.yml b/ansible/roles/core-net/remnawave/tasks/main.yml index 8bf95fa..b05072d 100644 --- a/ansible/roles/core-net/remnawave/tasks/main.yml +++ b/ansible/roles/core-net/remnawave/tasks/main.yml @@ -84,34 +84,18 @@ - name: Сохранить сгенерированные секреты панели в Infisical ansible.builtin.shell: | set -euo pipefail - args=() - if [ "${NEED_ADMIN}" = "True" ] || [ "${NEED_ADMIN}" = "true" ]; then - args+=("REMNAWAVE_ADMIN_USER=${RW_ADMIN_USER}" "REMNAWAVE_ADMIN_PASSWORD=${RW_ADMIN_PASS}") - fi - if [ "${NEED_APP}" = "True" ] || [ "${NEED_APP}" = "true" ]; then - args+=("REMNAWAVE_APP_SECRET=${RW_APP_SECRET}") - fi - if [ "${NEED_PG}" = "True" ] || [ "${NEED_PG}" = "true" ]; then - args+=("REMNAWAVE_POSTGRES_PASSWORD=${RW_PG_PASS}") - fi - if [ "${NEED_METRICS}" = "True" ] || [ "${NEED_METRICS}" = "true" ]; then - args+=("REMNAWAVE_METRICS_PASS=${RW_METRICS_PASS}") - fi - if [ "${NEED_WEBHOOK}" = "True" ] || [ "${NEED_WEBHOOK}" = "true" ]; then - args+=("REMNAWAVE_WEBHOOK_SECRET_HEADER=${RW_WEBHOOK}") - fi - # Не использовать ${#args[@]} — Ansible парсит {# как Jinja-комментарий. - set -- "${args[@]}" - if [ "$#" -eq 0 ]; then - exit 0 - fi out=$(infisical secrets set \ --domain="${INFISICAL_DOMAIN}" \ --token="${INFISICAL_TOKEN}" \ --env=prod \ --projectId="${INFISICAL_PROJECT_ID}" \ --path="/services/remnawave" \ - "$@" \ + "REMNAWAVE_ADMIN_USER=${RW_ADMIN_USER}" \ + "REMNAWAVE_ADMIN_PASSWORD=${RW_ADMIN_PASS}" \ + "REMNAWAVE_APP_SECRET=${RW_APP_SECRET}" \ + "REMNAWAVE_POSTGRES_PASSWORD=${RW_PG_PASS}" \ + "REMNAWAVE_METRICS_PASS=${RW_METRICS_PASS}" \ + "REMNAWAVE_WEBHOOK_SECRET_HEADER=${RW_WEBHOOK}" \ --silent 2>&1) || { echo "infisical secrets set failed: ${out}" >&2 exit 1 @@ -124,11 +108,6 @@ INFISICAL_DOMAIN: "{{ lookup('env', 'INFISICAL_DOMAIN') }}" INFISICAL_TOKEN: "{{ lookup('env', 'INFISICAL_TOKEN') }}" INFISICAL_PROJECT_ID: "{{ lookup('env', 'INFISICAL_PROJECT_ID') }}" - NEED_ADMIN: "{{ remnawave_need_admin_password }}" - NEED_APP: "{{ remnawave_need_app_secret }}" - NEED_PG: "{{ remnawave_need_postgres_password }}" - NEED_METRICS: "{{ remnawave_need_metrics_pass }}" - NEED_WEBHOOK: "{{ remnawave_need_webhook_secret }}" RW_ADMIN_USER: "{{ remnawave_admin_username }}" RW_ADMIN_PASS: "{{ remnawave_admin_password }}" RW_APP_SECRET: "{{ remnawave_app_secret }}" @@ -235,24 +214,14 @@ - name: Сохранить API-токен и SECRET_KEY ноды в Infisical ansible.builtin.shell: | set -euo pipefail - args=() - if [ "${NEED_TOKEN}" = "True" ] || [ "${NEED_TOKEN}" = "true" ]; then - args+=("REMNAWAVE_API_TOKEN=${RW_API_TOKEN}") - fi - if [ -n "${RW_NODE_SECRET}" ] && { [ "${NEED_NODE}" = "True" ] || [ "${NEED_NODE}" = "true" ]; }; then - args+=("REMNANODE_SECRET_KEY=${RW_NODE_SECRET}") - fi - set -- "${args[@]}" - if [ "$#" -eq 0 ]; then - exit 0 - fi out=$(infisical secrets set \ --domain="${INFISICAL_DOMAIN}" \ --token="${INFISICAL_TOKEN}" \ --env=prod \ --projectId="${INFISICAL_PROJECT_ID}" \ --path="/services/remnawave" \ - "$@" \ + "REMNAWAVE_API_TOKEN=${RW_API_TOKEN}" \ + "REMNANODE_SECRET_KEY=${RW_NODE_SECRET}" \ --silent 2>&1) || { echo "infisical secrets set failed: ${out}" >&2 exit 1 @@ -265,13 +234,13 @@ INFISICAL_DOMAIN: "{{ lookup('env', 'INFISICAL_DOMAIN') }}" INFISICAL_TOKEN: "{{ lookup('env', 'INFISICAL_TOKEN') }}" INFISICAL_PROJECT_ID: "{{ lookup('env', 'INFISICAL_PROJECT_ID') }}" - NEED_TOKEN: "{{ remnawave_bootstrap.token_updated | default(false) }}" - NEED_NODE: "{{ remnawave_need_node_secret }}" RW_API_TOKEN: "{{ remnawave_api_token }}" RW_NODE_SECRET: "{{ remnawave_bootstrap.node_secret | default('') }}" when: >- - remnawave_bootstrap.token_updated | default(false) - or (remnawave_need_node_secret and (remnawave_bootstrap.node_secret | default('') | length > 0)) + (remnawave_bootstrap.token_updated | default(false) + or remnawave_need_node_secret) + and (remnawave_bootstrap.node_secret | default('') | length > 0) + and (remnawave_api_token | default('') | length > 0) changed_when: true no_log: true