feat(remnawave): persist Reality keys in Infisical and auto-sync OPNsense VLESS link
This commit is contained in:
1 parent
ef8179e96e
commit
e623faff2b
6 files changed
+131
-4
No files matched your search
@@ -2,15 +2,20 @@
|
||||
- name: Определить изменившиеся секреты для Infisical
|
||||
ansible.builtin.set_fact:
|
||||
remnawave_current_xray_url: "{{ lookup('env', 'XRAY_CHECKER_SUBSCRIPTION_URL', default='') }}"
|
||||
remnawave_sync_reality_private_key: "{{ (remnawave_sync_secrets | default({})).reality_private_key | default('') }}"
|
||||
remnawave_sync_reality_short_id: "{{ (remnawave_sync_secrets | default({})).reality_short_id | default('') }}"
|
||||
remnawave_sync_opnsense_links: "{{ (remnawave_sync_secrets | default({})).opnsense_links | default({}) }}"
|
||||
remnawave_need_infisical_sync: >-
|
||||
{{
|
||||
(remnawave_bootstrap.token_updated | default(false)) or
|
||||
(remnawave_bootstrap.node_secret_created | default(false)) or
|
||||
((remnawave_xray_checker_url | default('') | length > 0) and (remnawave_xray_checker_url != lookup('env', 'XRAY_CHECKER_SUBSCRIPTION_URL', default='')))
|
||||
((remnawave_xray_checker_url | default('') | length > 0) and (remnawave_xray_checker_url != lookup('env', 'XRAY_CHECKER_SUBSCRIPTION_URL', default=''))) or
|
||||
(((remnawave_sync_secrets | default({})).reality_private_key | default('') | length > 0) and ((remnawave_sync_secrets | default({})).reality_private_key != lookup('env', 'REMNAWAVE_REALITY_PRIVATE_KEY', default=''))) or
|
||||
(((remnawave_sync_secrets | default({})).reality_short_id | default('') | length > 0) and ((remnawave_sync_secrets | default({})).reality_short_id != lookup('env', 'REMNAWAVE_REALITY_SHORT_ID', default='')))
|
||||
}}
|
||||
no_log: true
|
||||
|
||||
- name: Сохранить API-токен, SECRET_KEY ноды и ссылку Xray Checker в Infisical при изменении
|
||||
- name: Сохранить API-токен, SECRET_KEY ноды, ключи Reality и ссылку Xray Checker в Infisical при изменении
|
||||
ansible.builtin.shell: |
|
||||
set -euo pipefail
|
||||
args=(
|
||||
@@ -20,6 +25,12 @@
|
||||
if [ -n "${RW_XRAY_URL:-}" ]; then
|
||||
args+=("XRAY_CHECKER_SUBSCRIPTION_URL=${RW_XRAY_URL}")
|
||||
fi
|
||||
if [ -n "${RW_REALITY_PRIV:-}" ]; then
|
||||
args+=("REMNAWAVE_REALITY_PRIVATE_KEY=${RW_REALITY_PRIV}")
|
||||
fi
|
||||
if [ -n "${RW_REALITY_SID:-}" ]; then
|
||||
args+=("REMNAWAVE_REALITY_SHORT_ID=${RW_REALITY_SID}")
|
||||
fi
|
||||
infisical secrets set \
|
||||
--domain="${INFISICAL_DOMAIN}" \
|
||||
--token="${INFISICAL_TOKEN}" \
|
||||
@@ -39,12 +50,44 @@
|
||||
RW_API_TOKEN: "{{ remnawave_api_token }}"
|
||||
RW_NODE_SECRET: "{{ remnawave_node_secret | default(lookup('env', 'REMNANODE_SECRET_KEY', default='')) }}"
|
||||
RW_XRAY_URL: "{{ remnawave_xray_checker_url | default('') }}"
|
||||
RW_REALITY_PRIV: "{{ remnawave_sync_reality_private_key }}"
|
||||
RW_REALITY_SID: "{{ remnawave_sync_reality_short_id }}"
|
||||
when:
|
||||
- remnawave_api_token | default('') | length > 0
|
||||
- remnawave_need_infisical_sync | bool
|
||||
changed_when: true
|
||||
no_log: true
|
||||
|
||||
- name: Синхронизировать VLESS-ссылки нод в Infisical (/services/opnsense-xray) при изменении
|
||||
ansible.builtin.shell: |
|
||||
set -euo pipefail
|
||||
infisical secrets set \
|
||||
--domain="${INFISICAL_DOMAIN}" \
|
||||
--token="${INFISICAL_TOKEN}" \
|
||||
--env=prod \
|
||||
--projectId="${INFISICAL_PROJECT_ID}" \
|
||||
--path="/services/opnsense-xray" \
|
||||
"${SECRET_NAME}=${SECRET_VAL}" \
|
||||
--silent >/dev/null
|
||||
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') }}"
|
||||
SECRET_NAME: "{{ item.key }}"
|
||||
SECRET_VAL: "{{ item.value }}"
|
||||
loop: "{{ remnawave_sync_opnsense_links | dict2items }}"
|
||||
loop_control:
|
||||
label: "{{ item.key }}"
|
||||
when:
|
||||
- item.value | length > 0
|
||||
- item.value != lookup('env', item.key, default='')
|
||||
changed_when: true
|
||||
no_log: true
|
||||
|
||||
- name: Зарегистрировать панель Remnawave в Agent Vault
|
||||
ansible.builtin.include_role:
|
||||
name: agent_vault_service
|
||||
|
||||
@@ -41,7 +41,10 @@
|
||||
ansible.builtin.command: "python3 {{ remnawave_dir }}/sync_remnawave.py {{ remnawave_dir }}/sync_config.json"
|
||||
environment:
|
||||
RW_API_TOKEN: "{{ remnawave_api_token }}"
|
||||
RW_REALITY_PRIVATE_KEY: "{{ lookup('env', 'REMNAWAVE_REALITY_PRIVATE_KEY', default='') }}"
|
||||
RW_REALITY_SHORT_ID: "{{ lookup('env', 'REMNAWAVE_REALITY_SHORT_ID', default='') }}"
|
||||
RW_XRAY_URL_FILE: "{{ remnawave_dir }}/.xray-checker-url"
|
||||
RW_SYNC_SECRETS_FILE: "{{ remnawave_dir }}/.sync-secrets.json"
|
||||
register: remnawave_sync_raw
|
||||
changed_when: remnawave_sync_raw.rc == 0 and ((remnawave_sync_raw.stdout | from_json).changed | default(false))
|
||||
|
||||
@@ -52,8 +55,16 @@
|
||||
failed_when: false
|
||||
no_log: true
|
||||
|
||||
- name: Прочитать выходные секреты синхронизации Remnawave
|
||||
ansible.builtin.slurp:
|
||||
src: "{{ remnawave_dir }}/.sync-secrets.json"
|
||||
register: remnawave_sync_secrets_file
|
||||
failed_when: false
|
||||
no_log: true
|
||||
|
||||
- name: Разобрать результат синхронизации Remnawave
|
||||
ansible.builtin.set_fact:
|
||||
remnawave_sync: "{{ remnawave_sync_raw.stdout | from_json }}"
|
||||
remnawave_xray_checker_url: "{{ remnawave_xray_url_file.content | default('') | b64decode }}"
|
||||
remnawave_sync_secrets: "{{ (remnawave_sync_secrets_file.content | default('') | b64decode | from_json) if (remnawave_sync_secrets_file.content is defined and (remnawave_sync_secrets_file.content | length > 0)) else {} }}"
|
||||
no_log: true
|
||||
Reference in new issue
Block a user