refactor(remnawave): синхронизировать панель из desired.yml и шаблонов команд
ansible-deploy / plan (push) Successful in 1s
ansible-lint / lint (push) Successful in 2s
ansible-deploy / deploy (core-mon, ) (push) Successful in 37s
ansible-deploy / deploy (core-net, ) (push) Failing after 52s
ansible-deploy / deploy (core-secrets, ) (push) Successful in 24s
ansible-deploy / deploy (ger-nod-02, ) (push) Successful in 1m20s
ansible-deploy / deploy (opnsense, ) (push) Successful in 13s
ansible-deploy / deploy (rus-central, ) (push) Successful in 1m6s

Повторный прогон без смены compose не тянет образы, ноды и сквады добавляются данными, а не новым плейбуком на каждый VPS.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
karpenokandCursor committed 2026-11-18 17:18:49 +07:00
1 parent 89f928c64a
commit 99ee815213
22 files changed
+1151 -672

No files matched your search

@@ -30,6 +30,9 @@ remnawave_netbird_peers_url: "https://central.gunihome.ru/api/peers"
remnawave_xray_checker_user: "homelab"
remnawave_api_token_name: "infra-automation"
# Pull образов только если изменился compose или явно -e remnawave_pull_images=true.
remnawave_pull_images: false
# Документация WAN egress панели (см. remnanode_panel_egress_ips на выходных нодах).
remnawave_panel_egress_ips:
- "213.128.28.107" # провайдер 1 (МТС)
@@ -0,0 +1,177 @@
# Шаблоны команд Remnawave API. Новый однотипный ресурс — шаг здесь.
# prepare/compare_with/after/run — короткие хуки в sync_remnawave.py
# (ключ Reality, адрес NetBird, uuid профилей, правило Browser, пользователи).
# {поле} подставляется из элемента. Целая строка "{поле}" сохраняет тип (объект, список).
steps:
- id: xray_templates
from: xray_templates
prepare: load_json_file
list: {method: GET, path: /subscription-templates/, key: templates}
match: [name, templateType]
compare: [templateJson]
prune:
where: {templateType: XRAY_JSON}
save: {as: xray_template, key: name}
create:
method: POST
path: /subscription-templates/
body:
name: "{name}"
templateType: "{templateType}"
templateJson: "{templateJson}"
update:
method: PATCH
path: /subscription-templates/
body:
uuid: "{uuid}"
templateJson: "{templateJson}"
delete:
method: DELETE
path: "/subscription-templates/{uuid}"
- id: profiles
from: profiles
prepare: render_profile
list: {method: GET, path: /config-profiles/, key: configProfiles}
match: [name]
compare_with: profile_config
prune: true
save: {as: profile, key: name}
refresh: {method: GET, path: "/config-profiles/{uuid}"}
create:
method: POST
path: /config-profiles/
body:
name: "{name}"
config: "{config}"
update:
method: PATCH
path: /config-profiles/
body:
uuid: "{uuid}"
config: "{config}"
delete:
method: DELETE
path: "/config-profiles/{uuid}"
- id: nodes
from: nodes
prepare: prepare_node
list: {method: GET, path: /nodes/, key: nodes}
match: [name]
compare_with: node_binding
prune: true
after: enable_if_disabled
save: {as: node, key: name}
create:
method: POST
path: /nodes/
body:
name: "{name}"
address: "{address}"
port: "{port}"
countryCode: "{countryCode}"
configProfile: "{configProfile}"
update:
method: PATCH
path: /nodes/
body:
uuid: "{uuid}"
address: "{address}"
port: "{port}"
countryCode: "{countryCode}"
configProfile: "{configProfile}"
update_fallback:
method: PUT
path: /nodes/
body:
uuid: "{uuid}"
address: "{address}"
port: "{port}"
countryCode: "{countryCode}"
configProfile: "{configProfile}"
delete:
method: DELETE
path: "/nodes/{uuid}"
- id: hosts
from: nodes
prepare: prepare_host
list: {method: GET, path: /hosts/, key: hosts}
match_prepared: [address]
compare_with: host_binding
prune: true
save: {as: host, key: address}
create:
method: POST
path: /hosts/
body:
remark: "{remark}"
address: "{address}"
port: "{port}"
path: "{path}"
sni: "{sni}"
host: "{host}"
fingerprint: chrome
isDisabled: false
securityLayer: DEFAULT
alpn: h2
xHttpExtraParams:
xmux:
maxConcurrency: "16-32"
hMaxRequestTimes: "600-900"
hMaxReusableSecs: "1800-3000"
noSSEHeader: true
xPaddingBytes: "100-1000"
inbound:
configProfileUuid: "{profile_uuid}"
configProfileInboundUuid: "{inbound_uuid}"
nodes: "{nodes}"
xrayJsonTemplateUuid: "{xrayJsonTemplateUuid}"
update:
method: PATCH
path: /hosts/
body:
uuid: "{uuid}"
remark: "{remark}"
path: "{path}"
sni: "{sni}"
host: "{host}"
port: "{port}"
alpn: "{alpn}"
fingerprint: "{fingerprint}"
xrayJsonTemplateUuid: "{xrayJsonTemplateUuid}"
nodes: "{nodes}"
delete:
method: DELETE
path: "/hosts/{uuid}"
- id: squads
from: squads
prepare: prepare_squad
list: {method: GET, path: /internal-squads/, key: internalSquads}
match: [name]
compare_with: squad_inbounds
prune: true
save: {as: squad, key: name}
create:
method: POST
path: /internal-squads/
body:
name: "{name}"
inbounds: "{inbounds}"
update:
method: PATCH
path: /internal-squads/
body:
uuid: "{uuid}"
inbounds: "{inbounds}"
delete:
method: DELETE
path: "/internal-squads/{uuid}"
- id: subscription
run: subscription_settings
- id: users
run: users
@@ -0,0 +1,32 @@
# Желаемое состояние панели Remnawave.
# Новая выходная нода: запись в nodes, профиль (если новый), сквад, хост в inventory
# (группы remnanodes и exit_nodes, имя с «-nod-»). Повторный прогон панели — тег remnawave_sync,
# без pull образов. Сквад, нода, host и профиль, которых здесь нет, с панели удаляются.
# Тег inbound уникален среди профилей.
xray_templates:
- name: Except-RU
templateType: XRAY_JSON
file: xray-except-ru.json
profiles:
- name: DE-Yali
template: profile-selfsteal-xhttp.json
inbound_tag: Steal-Yali
selfsteal_domain: yali.gunis.top
xhttp_path: /xhttp-yali
squads:
- name: Default-Squad
inbounds: [Steal-Yali]
subscription_page_config: Homelab
nodes:
- name: Ger-nod-02
address: "150.241.64.209"
netbird_hostname: ger-nod-02
port: 2222
country_code: DE
profile: DE-Yali
host_remark: "🇩🇪 ger-nod-02"
@@ -1,22 +0,0 @@
# Декларативная конфигурация профилей, нод и хостов Remnawave.
# Добавление новой выходной VPS: добавить запись в nodes и прогнать ansible-core-net.
xray_template:
name: Except-RU
file: xray-except-ru.json
squad_name: Default-Squad
subscription_page_config: Homelab
nodes:
- name: Ger-nod-02
address: "150.241.64.209"
netbird_hostname: "ger-nod-02"
port: 2222
country_code: "DE"
profile_name: "DE-Yali"
profile_template: "profile-selfsteal-xhttp.json"
inbound_tag: "Steal-Yali"
selfsteal_domain: "yali.gunis.top"
xhttp_path: "/xhttp-yali"
host_remark: "🇩🇪 ger-nod-02"
File diff suppressed because it is too large. Load diff
@@ -136,9 +136,11 @@
owner: root
group: root
mode: "0644"
register: remnawave_compose_file
- name: Стянуть образы панели Remnawave
ansible.builtin.command: docker compose -f {{ remnawave_dir }}/compose.yaml pull
when: remnawave_compose_file is changed or (remnawave_pull_images | bool)
register: remnawave_compose_pull
changed_when: "'Pulled' in remnawave_compose_pull.stderr or 'Downloaded' in remnawave_compose_pull.stderr"
retries: 3
@@ -1,78 +1,12 @@
---
- name: Развернуть и инициализировать панель Remnawave
ansible.builtin.include_tasks: bootstrap.yml
- name: Развернуть панель Remnawave
ansible.builtin.import_tasks: bootstrap.yml
tags: [remnawave, remnawave_bootstrap]
- name: Синхронизировать ноды, профили, шаблоны и пользователей Remnawave
ansible.builtin.include_tasks: sync.yml
- name: Синхронизировать состояние панели Remnawave
ansible.builtin.import_tasks: sync.yml
tags: [remnawave, remnawave_sync]
- name: Определить изменившиеся секреты для Infisical
ansible.builtin.set_fact:
remnawave_current_xray_url: "{{ lookup('env', 'XRAY_CHECKER_SUBSCRIPTION_URL', 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='')))
}}
no_log: true
- name: Сохранить API-токен, SECRET_KEY ноды и ссылку Xray Checker в Infisical при изменении
ansible.builtin.shell: |
set -euo pipefail
args=(
"REMNAWAVE_API_TOKEN=${RW_API_TOKEN}"
"REMNANODE_SECRET_KEY=${RW_NODE_SECRET}"
)
if [ -n "${RW_XRAY_URL:-}" ]; then
args+=("XRAY_CHECKER_SUBSCRIPTION_URL=${RW_XRAY_URL}")
fi
infisical secrets set \
--domain="${INFISICAL_DOMAIN}" \
--token="${INFISICAL_TOKEN}" \
--env=prod \
--projectId="${INFISICAL_PROJECT_ID}" \
--path="/services/remnawave" \
"${args[@]}" \
--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') }}"
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('') }}"
when:
- remnawave_api_token | default('') | length > 0
- remnawave_need_infisical_sync | bool
changed_when: true
no_log: true
- name: Зарегистрировать панель Remnawave в Agent Vault
ansible.builtin.include_role:
name: agent_vault_service
vars:
agent_vault_service_name: remnawave-panel
agent_vault_service_description: >-
Панель Remnawave (rw.gunihome.ru): ноды, пользователи и подписки VPN.
Креденшл — сервисный API-токен панели.
agent_vault_service_host: "{{ remnawave_panel_domain }}:443"
agent_vault_service_paths: ["/api"]
agent_vault_service_methods: [GET, POST]
agent_vault_secret_path: /services/remnawave
agent_vault_secret_key: REMNAWAVE_API_TOKEN
when: remnawave_api_token | default('') | length > 0
- name: Итог Remnawave panel
ansible.builtin.debug:
msg:
- "Панель: https://{{ remnawave_panel_domain }}"
- "Подписка: https://{{ remnawave_sub_domain }}"
- "Админ создан в этом прогоне: {{ remnawave_bootstrap.admin_created | default(false) }}"
- "API-токен обновлён в Infisical: {{ remnawave_bootstrap.token_updated | default(false) }}"
- "SECRET_KEY ноды получен в этом прогоне: {{ remnawave_bootstrap.node_secret_created | default(false) }}"
- "Изменения sync (nodes.yml / users.yml): {{ remnawave_sync.changes | default([]) }}"
- "Предупреждения sync: {{ remnawave_sync.warnings | default([]) }}"
- name: Опубликовать секреты и итог Remnawave
ansible.builtin.import_tasks: publish.yml
tags: [remnawave, remnawave_sync, remnawave_bootstrap]
@@ -0,0 +1,72 @@
---
- name: Определить изменившиеся секреты для Infisical
ansible.builtin.set_fact:
remnawave_current_xray_url: "{{ lookup('env', 'XRAY_CHECKER_SUBSCRIPTION_URL', 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='')))
}}
no_log: true
- name: Сохранить API-токен, SECRET_KEY ноды и ссылку Xray Checker в Infisical при изменении
ansible.builtin.shell: |
set -euo pipefail
args=(
"REMNAWAVE_API_TOKEN=${RW_API_TOKEN}"
"REMNANODE_SECRET_KEY=${RW_NODE_SECRET}"
)
if [ -n "${RW_XRAY_URL:-}" ]; then
args+=("XRAY_CHECKER_SUBSCRIPTION_URL=${RW_XRAY_URL}")
fi
infisical secrets set \
--domain="${INFISICAL_DOMAIN}" \
--token="${INFISICAL_TOKEN}" \
--env=prod \
--projectId="${INFISICAL_PROJECT_ID}" \
--path="/services/remnawave" \
"${args[@]}" \
--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') }}"
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('') }}"
when:
- remnawave_api_token | default('') | length > 0
- remnawave_need_infisical_sync | bool
changed_when: true
no_log: true
- name: Зарегистрировать панель Remnawave в Agent Vault
ansible.builtin.include_role:
name: agent_vault_service
vars:
agent_vault_service_name: remnawave-panel
agent_vault_service_description: >-
Панель Remnawave (rw.gunihome.ru): ноды, пользователи и подписки VPN.
Креденшл — сервисный API-токен панели.
agent_vault_service_host: "{{ remnawave_panel_domain }}:443"
agent_vault_service_paths: ["/api"]
agent_vault_service_methods: [GET, POST]
agent_vault_secret_path: /services/remnawave
agent_vault_secret_key: REMNAWAVE_API_TOKEN
when: remnawave_api_token | default('') | length > 0
- name: Итог Remnawave panel
ansible.builtin.debug:
msg:
- "Панель: https://{{ remnawave_panel_domain }}"
- "Подписка: https://{{ remnawave_sub_domain }}"
- "Админ создан в этом прогоне: {{ remnawave_bootstrap.admin_created | default(false) }}"
- "API-токен обновлён в Infisical: {{ remnawave_bootstrap.token_updated | default(false) }}"
- "SECRET_KEY ноды получен в этом прогоне: {{ remnawave_bootstrap.node_secret_created | default(false) }}"
- "Изменения sync (desired.yml / users.yml): {{ remnawave_sync.changes | default([]) }}"
- "Предупреждения sync: {{ remnawave_sync.warnings | default([]) }}"
+22 -14
View File
@@ -1,8 +1,9 @@
---
- name: Загрузить декларативную конфигурацию нод и пользователей Remnawave
- name: Загрузить желаемое состояние и шаблоны команд Remnawave
ansible.builtin.set_fact:
remnawave_nodes_cfg: "{{ lookup('file', role_path ~ '/files/nodes.yml') | from_yaml }}"
remnawave_desired: "{{ lookup('file', role_path ~ '/files/desired.yml') | from_yaml }}"
remnawave_users_cfg: "{{ lookup('file', role_path ~ '/files/users.yml') | from_yaml }}"
remnawave_commands: "{{ lookup('file', role_path ~ '/files/commands.yml') | from_yaml }}"
- name: Проверить, что панель сама в NetBird
ansible.builtin.command: netbird status
@@ -10,6 +11,11 @@
changed_when: false
failed_when: false
- name: Собрать тексты JSON-шаблонов
ansible.builtin.set_fact:
remnawave_spec_files: "{{ remnawave_spec_files | default({}) | combine({item: lookup('file', role_path ~ '/files/' ~ item)}) }}"
loop: "{{ ((remnawave_desired.xray_templates | default([]) | map(attribute='file') | list) + (remnawave_desired.profiles | default([]) | map(attribute='template') | list)) | unique }}"
- name: Собрать конфигурацию синхронизации Remnawave
ansible.builtin.set_fact:
remnawave_sync_payload:
@@ -18,15 +24,10 @@
netbird_peers_url: "{{ remnawave_netbird_peers_url }}"
netbird_connected: "{{ 'Management: Connected' in (remnawave_local_netbird.stdout | default('')) }}"
xray_checker_user: "{{ remnawave_xray_checker_user }}"
xray_template: "{{ remnawave_nodes_cfg.xray_template }}"
xray_template_json: "{{ lookup('file', role_path ~ '/files/' ~ remnawave_nodes_cfg.xray_template.file) | from_json }}"
squad_name: "{{ remnawave_nodes_cfg.squad_name | default('Default-Squad') }}"
subscription_page_config: "{{ remnawave_nodes_cfg.subscription_page_config | default('Homelab') }}"
nodes: "{{ remnawave_nodes_cfg.nodes | default([]) }}"
managed_tag: "{{ remnawave_users_cfg.managed_tag | default('IAC') }}"
users: "{{ remnawave_users_cfg.users | default([]) }}"
profile_templates:
profile-selfsteal-xhttp.json: "{{ lookup('file', role_path ~ '/files/profile-selfsteal-xhttp.json') }}"
desired: "{{ remnawave_desired }}"
users_doc: "{{ remnawave_users_cfg }}"
commands: "{{ remnawave_commands }}"
files: "{{ remnawave_spec_files }}"
- name: Положить скрипт синхронизации Remnawave
ansible.builtin.copy:
@@ -44,17 +45,24 @@
group: root
mode: "0600"
- name: Синхронизировать шаблоны, профили, ноды, хосты и пользователей Remnawave
- name: Синхронизировать шаблоны, профили, ноды, хосты, сквады и пользователей
ansible.builtin.command: "python3 {{ remnawave_dir }}/sync_remnawave.py {{ remnawave_dir }}/sync_config.json"
environment:
RW_API_TOKEN: "{{ remnawave_api_token }}"
NB_API_TOKEN: "{{ lookup('env', 'NETBIRD_API_TOKEN', default='') }}"
RW_XRAY_URL_FILE: "{{ remnawave_dir }}/.xray-checker-url"
register: remnawave_sync_raw
changed_when: remnawave_sync_raw.rc == 0 and ((remnawave_sync_raw.stdout | from_json).changed | default(false))
- name: Прочитать ссылку Xray Checker
ansible.builtin.slurp:
src: "{{ remnawave_dir }}/.xray-checker-url"
register: remnawave_xray_url_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_sync_raw.stdout | from_json).xray_checker_subscription_url | default('') }}"
remnawave_xray_checker_url: "{{ remnawave_xray_url_file.content | default('') | b64decode }}"
no_log: true