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
+1142 -663

No files matched your search

+2 -10
View File
@@ -11,18 +11,10 @@ on:
workflow_dispatch:
inputs:
machine:
description: 'Целевая машина (или all для полного прогона)'
description: 'Машина: all, имя плейбука или хост группы remnanodes (имя с -nod-)'
required: true
default: 'all'
type: choice
options:
- all
- core-net
- core-secrets
- core-mon
- rus-central
- ger-nod-02
- opnsense
type: string
tags:
description: 'Необязательный фильтр тегов (например: remnawave, netbird, monitoring)'
required: false
+23 -1
View File
@@ -9,7 +9,7 @@ import subprocess
import sys
from pathlib import Path
SKIP_PLAYBOOKS = {"site", "host", "core-git"}
SKIP_PLAYBOOKS = {"site", "host", "core-git", "remnanodes"}
def list_machines(playbooks_dir: Path) -> list[str]:
@@ -21,6 +21,25 @@ def list_machines(playbooks_dir: Path) -> list[str]:
return machines
def remnanode_hosts(inventory: Path) -> list[str]:
hosts: list[str] = []
in_group = False
for line in inventory.read_text(encoding="utf-8").splitlines():
if not in_group:
if line.startswith(" remnanodes:"):
in_group = True
continue
if not line.strip() or line.lstrip().startswith("#"):
continue
indent = len(line) - len(line.lstrip(" "))
if indent <= 4:
break
stripped = line.strip()
if indent >= 8 and stripped.endswith(":") and stripped != "hosts:":
hosts.append(stripped[:-1])
return hosts
def main() -> int:
event = os.environ.get("EVENT_NAME", "push").strip()
before = os.environ.get("EVENT_BEFORE", "").strip()
@@ -30,6 +49,9 @@ def main() -> int:
root = Path(__file__).resolve().parents[2]
machines = list_machines(root / "ansible" / "playbooks")
for host in remnanode_hosts(root / "ansible" / "inventories" / "prod" / "hosts.yml"):
if host not in machines:
machines.append(host)
include: list[dict[str, str]] = []
if event == "workflow_dispatch":
+51 -5
View File
@@ -12,14 +12,39 @@ before=${3:-}
after=${4:-}
override_tags=${5:-}
is_remnanode() {
awk -v m="$1" '
$0 ~ "^ remnanodes:" {s=1; next}
s && $0 ~ "^ [^ ]" {s=0}
s && $0 ~ "^ " m ":$" {f=1}
END {exit !f}
' ansible/inventories/prod/hosts.yml
}
playbook="ansible/playbooks/${machine}.yml"
if [ "$machine" = "site" ] || [ "$machine" = "host" ] || [ ! -f "$playbook" ]; then
playbook_out="playbooks/${machine}.yml"
limit=""
if [ "$machine" = "site" ] || [ "$machine" = "host" ]; then
echo "Неизвестная машина: $machine" >&2
exit 2
fi
if [ ! -f "$playbook" ]; then
if is_remnanode "$machine"; then
playbook="ansible/playbooks/remnanodes.yml"
playbook_out="playbooks/remnanodes.yml"
limit="$machine"
else
echo "Неизвестная машина: $machine" >&2
exit 2
fi
fi
if [ -n "$override_tags" ]; then
printf '%s\n' "playbooks/${machine}.yml" "--tags" "$override_tags"
if [ -n "$limit" ]; then
printf '%s\n' "$playbook_out" "--limit" "$limit" "--tags" "$override_tags"
else
printf '%s\n' "$playbook_out" "--tags" "$override_tags"
fi
exit 0
fi
@@ -63,9 +88,19 @@ if [ "$full" -eq 0 ] && [ -n "$changed" ]; then
for file in $changed; do
[ -n "$file" ] || continue
case "$file" in
ansible/ansible.cfg | ansible/roles/host/* | ansible/playbooks/host.yml | ansible/playbooks/site.yml | ansible/playbooks/"$machine".yml | ansible/inventories/prod/hosts.yml | ansible/inventories/prod/group_vars/* | ansible/inventories/prod/host_vars/"$machine".yml)
ansible/ansible.cfg | ansible/roles/host/* | ansible/playbooks/host.yml | ansible/playbooks/site.yml | ansible/playbooks/"$machine".yml | ansible/inventories/prod/group_vars/* | ansible/inventories/prod/host_vars/"$machine".yml)
full_from_files=1
;;
ansible/inventories/prod/hosts.yml)
if git diff -U0 "$before" "$after" -- "$file" | grep -E "^[+-].*${machine}:" >/dev/null; then
full_from_files=1
fi
;;
ansible/playbooks/remnanodes.yml)
if is_remnanode "$machine"; then
full_from_files=1
fi
;;
ansible/roles/netbird_client/* | ansible/roles/netbird_exit_node/*)
if grep -qE "role: (netbird_client|netbird_exit_node)" "$playbook"; then
add_tag netbird
@@ -86,12 +121,19 @@ if [ "$full" -eq 0 ] && [ -n "$changed" ]; then
add_tag vector
fi
;;
ansible/roles/core-net/remnawave/files/*|\
ansible/roles/core-net/remnawave/tasks/sync.yml|\
ansible/roles/core-net/remnawave/tasks/publish.yml)
if [ "$machine" = "core-net" ]; then
add_tag remnawave_sync
fi
;;
ansible/roles/"$machine"/.ci-trigger)
;;
ansible/roles/"$machine"/*/*)
product=${file#ansible/roles/"$machine"/}
product=${product%%/*}
if grep -q "role: ${machine}/${product}" "$playbook" && grep -q "tags: \[${product}\]" "$playbook"; then
if grep -qE "role: ${machine}/${product}|name: ${machine}/${product}" "$playbook" && grep -q "tags: \\[${product}" "$playbook"; then
add_tag "$product"
elif [ ! -e "$file" ] && [ ! -d "ansible/roles/${machine}/${product}" ]; then
:
@@ -115,5 +157,9 @@ fi
if [ "$full" -eq 1 ] || [ "$full_from_files" -eq 1 ]; then
printf '%s\n' "playbooks/site.yml" "--limit" "$machine"
elif [ -n "$tags" ]; then
printf '%s\n' "playbooks/${machine}.yml" "--tags" "$tags"
if [ -n "$limit" ]; then
printf '%s\n' "$playbook_out" "--limit" "$limit" "--tags" "$tags"
else
printf '%s\n' "$playbook_out" "--tags" "$tags"
fi
fi
+14 -1
View File
@@ -18,7 +18,20 @@ case "$machine" in
;;
esac
if [ "$machine" = "site" ] || [ "$machine" = "host" ] || [ ! -f "$root/ansible/playbooks/${machine}.yml" ]; then
is_remnanode() {
awk -v m="$1" '
$0 ~ "^ remnanodes:" {s=1; next}
s && $0 ~ "^ [^ ]" {s=0}
s && $0 ~ "^ " m ":$" {f=1}
END {exit !f}
' "$root/ansible/inventories/prod/hosts.yml"
}
if [ "$machine" = "site" ] || [ "$machine" = "host" ]; then
echo "Неизвестная машина: $machine" >&2
exit 2
fi
if [ ! -f "$root/ansible/playbooks/${machine}.yml" ] && ! is_remnanode "$machine"; then
echo "Неизвестная машина: $machine" >&2
exit 2
fi
@@ -1,7 +1,7 @@
---
ansible_host: 150.241.64.209
ansible_user: root
remnanode_selfsteal_domain: "yali.gunis.top"
# Домен SelfSteal берётся из desired.yml (профиль ноды).
# WAN egress панели (core-net): оба провайдера → NODE_PORT
remnanode_panel_egress_ips:
- "213.128.28.107" # провайдер 1 (МТС)
+4
View File
@@ -3,6 +3,7 @@
# кроме monitoring_scrape_exclude_hosts, хостов с monitoring_scrape_enabled: false
# и хостов из vmagent_central_scrape_skip (у них свой vmagent).
# ger-nod-02 отдаёт метрики своим vmagent.
# Выходные ноды Remnawave: имя с «-nod-», группы remnanodes и exit_nodes.
all:
hosts:
core-net:
@@ -27,6 +28,9 @@ all:
ansible_host: 192.168.1.1
ansible_connection: local
children:
remnanodes:
hosts:
ger-nod-02:
exit_nodes:
hosts:
ger-nod-02:
+16 -2
View File
@@ -5,8 +5,6 @@
roles:
- role: core-net/traefik
tags: [traefik]
- role: core-net/remnawave
tags: [remnawave]
- role: core-net/authentik
tags: [authentik]
- role: core-net/vmagent
@@ -15,3 +13,19 @@
tags: [netbird]
- role: vector
tags: [vector]
tasks:
- name: Развернуть панель Remnawave
ansible.builtin.import_role:
name: core-net/remnawave
tasks_from: bootstrap.yml
tags: [remnawave, remnawave_bootstrap]
- name: Синхронизировать состояние Remnawave
ansible.builtin.import_role:
name: core-net/remnawave
tasks_from: sync.yml
tags: [remnawave, remnawave_sync]
- name: Опубликовать секреты Remnawave
ansible.builtin.import_role:
name: core-net/remnawave
tasks_from: publish.yml
tags: [remnawave, remnawave_sync, remnawave_bootstrap]
+11
View File
@@ -0,0 +1,11 @@
---
- name: Выходные ноды Remnawave
hosts: remnanodes
gather_facts: false
roles:
- role: netbird_exit_node
tags: [netbird]
- role: remnanode
tags: [remnanode]
- role: vmagent
tags: [vmagent]
+1 -1
View File
@@ -5,5 +5,5 @@
- ansible.builtin.import_playbook: core-mon.yml
- ansible.builtin.import_playbook: core-git.yml
- ansible.builtin.import_playbook: rus-central.yml
- ansible.builtin.import_playbook: ger-nod-02.yml
- ansible.builtin.import_playbook: remnanodes.yml
- ansible.builtin.import_playbook: opnsense.yml
@@ -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
+31
View File
@@ -1,4 +1,34 @@
---
- name: Взять описание ноды из desired.yml
ansible.builtin.set_fact:
remnanode_stack: "{{ lookup('file', playbook_dir ~ '/../roles/core-net/remnawave/files/desired.yml') | from_yaml }}"
- name: Найти эту ноду в desired.yml
ansible.builtin.set_fact:
remnanode_node_matches: "{{ remnanode_stack.nodes | selectattr('netbird_hostname', 'equalto', inventory_hostname) | list }}"
- name: Нода должна быть описана в desired.yml
ansible.builtin.assert:
that:
- remnanode_node_matches | length == 1
fail_msg: "В desired.yml нет ровно одной ноды с netbird_hostname={{ inventory_hostname }}"
- name: Подставить профиль ноды
ansible.builtin.set_fact:
remnanode_node: "{{ remnanode_node_matches[0] }}"
remnanode_profile_matches: "{{ remnanode_stack.profiles | selectattr('name', 'equalto', remnanode_node_matches[0].profile) | list }}"
- name: Профиль ноды должен быть в desired.yml
ansible.builtin.assert:
that:
- remnanode_profile_matches | length == 1
fail_msg: "В desired.yml нет профиля {{ remnanode_node.profile }}"
- name: Домен и путь SelfSteal из профиля
ansible.builtin.set_fact:
remnanode_selfsteal_domain: "{{ remnanode_profile_matches[0].selfsteal_domain }}"
remnanode_xhttp_path: "{{ remnanode_profile_matches[0].xhttp_path }}"
- name: Проверить SECRET_KEY ноды и Cloudflare API
ansible.builtin.assert:
that:
@@ -16,6 +46,7 @@
- certbot
state: present
update_cache: true
cache_valid_time: 86400
- name: Создать каталоги ноды
ansible.builtin.file:
@@ -4,25 +4,10 @@
# Секреты setup-ключей сохраняются в Infisical (/services/netbird) автоматически
# и не попадают в Git или логи CI.
# Управляемые группы пиров
# Группы exit-<hostname> для нод из desired.yml добавляет sync_access.py.
client_groups:
- exit-clients
- remnawave
- exit-ger-nod-02
# Выходные шлюзы (Exit Nodes)
exit_nodes:
- network_id: exit-ger-nod-02
description: "Exit Node DE (0.0.0.0/0 via ger-nod-02)"
peer: ger-nod-02
peer_group: exit-ger-nod-02
client_groups:
- exit-clients
metric: 9999
masquerade: true
keep_route: false
skip_auto_apply: false
enabled: true
# DNS для клиентских групп
dns_nameservers:
@@ -58,10 +43,6 @@ peers:
groups:
- remnawave
state: present
- name: "ger-nod-02"
groups:
- exit-ger-nod-02
state: present
# Zero-Trust политики доступа (заменяют дефолтную политику Default All <-> All).
# Инициировать соединения в сторону внешних нод могут только панель (core-net) и клиенты (exit-clients).
@@ -83,8 +64,7 @@ policies:
- "9101"
sources:
- remnawave
destinations:
- exit-ger-nod-02
destinations: "@remnawave_exit_groups"
- name: "exit-clients-to-exit-nodes"
description: "One-way traffic from Exit Node clients to Exit Nodes"
@@ -98,8 +78,7 @@ policies:
bidirectional: false
sources:
- exit-clients
destinations:
- exit-ger-nod-02
destinations: "@remnawave_exit_groups"
- name: "exit-clients-udp"
description: "Allow outbound UDP from exit-clients via exit node"
enabled: true
@@ -108,8 +87,7 @@ policies:
bidirectional: false
sources:
- exit-clients
destinations:
- exit-ger-nod-02
destinations: "@remnawave_exit_groups"
- name: "exit-clients-icmp"
description: "Allow ICMP for exit-clients via exit node"
enabled: true
@@ -118,5 +96,4 @@ policies:
bidirectional: true
sources:
- exit-clients
destinations:
- exit-ger-nod-02
destinations: "@remnawave_exit_groups"
@@ -73,10 +73,59 @@ def group_peer_ids(grp: dict[str, Any]) -> list[str]:
return [p["id"] for p in (grp.get("peers") or []) if p.get("id")]
def expand_remnawave(cfg: dict[str, Any]) -> None:
"""Группы, exit-маршруты и пиры нод берутся из desired.yml, не копируются руками."""
if "remnawave_nodes" not in cfg:
return
nodes = cfg.pop("remnawave_nodes") or []
groups: list[str] = []
for node in nodes:
host = str(node.get("netbird_hostname") or "").strip()
if not host:
continue
group = f"exit-{host}"
groups.append(group)
client_groups = cfg.setdefault("client_groups", [])
if group not in client_groups:
client_groups.append(group)
exits = cfg.setdefault("exit_nodes", [])
if not any(item.get("network_id") == group for item in exits):
code = str(node.get("country_code") or "").strip()
exits.append(
{
"network_id": group,
"description": f"Exit Node {code} via {host}".strip(),
"peer": host,
"peer_group": group,
"client_groups": ["exit-clients"],
"metric": 9999,
"masquerade": True,
"keep_route": False,
"skip_auto_apply": False,
"enabled": True,
}
)
peers = cfg.setdefault("peers", [])
if not any(item.get("name") == host for item in peers):
peers.append({"name": host, "groups": [group], "state": "present"})
cfg["_remnawave_exit_groups"] = groups
for policy in cfg.get("policies") or []:
for rule in policy.get("rules") or []:
dest = rule.get("destinations")
if dest == "@remnawave_exit_groups":
rule["destinations"] = list(groups)
elif isinstance(dest, list) and "@remnawave_exit_groups" in dest:
expanded: list[str] = []
for item in dest:
expanded.extend(groups if item == "@remnawave_exit_groups" else [item])
rule["destinations"] = expanded
def sync(cfg: dict[str, Any], api: NetBirdAPI) -> dict[str, Any]:
changes: list[str] = []
warnings: list[str] = []
updated_secrets: dict[str, str] = {}
expand_remnawave(cfg)
peers_raw = api.get("/peers") or []
groups_raw = api.get("/groups") or []
@@ -217,6 +266,22 @@ def sync(cfg: dict[str, Any], api: NetBirdAPI) -> dict[str, Any]:
api.put(f"/routes/{existing['id']}", desired)
changes.append(f"route.update:{net_id}")
keep_exit_groups = cfg.get("_remnawave_exit_groups")
if keep_exit_groups is not None:
keep = set(keep_exit_groups)
for route in routes_raw:
net_id = str(route.get("network_id") or "")
if route.get("network") == "0.0.0.0/0" and net_id.startswith("exit-") and net_id not in keep and route.get("id"):
api.delete(f"/routes/{route['id']}")
changes.append(f"route.delete:{net_id}")
for gname, grp in list(groups_by_name.items()):
if not gname.startswith("exit-") or gname == "exit-clients" or gname in keep:
continue
current_ids = group_peer_ids(grp)
if current_ids:
set_group_peers(grp, [])
changes.append(f"group.clear:{gname}")
# 4. DNS Nameservers
ns_raw = api.get("/dns/nameservers") or []
for item in cfg.get("dns_nameservers") or []:
@@ -2,6 +2,11 @@
- name: Загрузить декларативную конфигурацию доступа NetBird
ansible.builtin.set_fact:
netbird_access_cfg: "{{ lookup('file', role_path ~ '/files/access.yml') | from_yaml }}"
netbird_remnawave_nodes: "{{ (lookup('file', playbook_dir ~ '/../roles/core-net/remnawave/files/desired.yml') | from_yaml).nodes | default([]) }}"
- name: Передать ноды Remnawave в синхронизацию доступа
ansible.builtin.set_fact:
netbird_access_cfg: "{{ netbird_access_cfg | combine({'remnawave_nodes': netbird_remnawave_nodes}) }}"
- name: Положить скрипт синхронизации доступа NetBird
ansible.builtin.copy: