diff --git a/ansible/roles/core-net/remnawave/files/profile-cascade-ru.json b/ansible/roles/core-net/remnawave/files/profile-cascade-ru.json index e92e128..9f40077 100644 --- a/ansible/roles/core-net/remnawave/files/profile-cascade-ru.json +++ b/ansible/roles/core-net/remnawave/files/profile-cascade-ru.json @@ -2,6 +2,15 @@ "log": { "loglevel": "warning" }, + "dns": { + "servers": [ + { + "address": "https://dns.google/dns-query", + "skipFallback": false + } + ], + "queryStrategy": "UseIP" + }, "inbounds": [ { "tag": "__INBOUND_TAG__", diff --git a/ansible/roles/core-net/remnawave/files/sync_remnawave.py b/ansible/roles/core-net/remnawave/files/sync_remnawave.py index 861a14e..b6b0c1d 100644 --- a/ansible/roles/core-net/remnawave/files/sync_remnawave.py +++ b/ansible/roles/core-net/remnawave/files/sync_remnawave.py @@ -212,9 +212,14 @@ def ensure_cascade_credentials( if has_cascade_inb and ru_prof: return {} + _, users_resp = api.request("GET", "/users/") + users_list = _extract_list(users_resp, "users") + homelab_user = next((u for u in users_list if u.get("username") == "homelab"), None) + cascade_uuid = (homelab_user or {}).get("vlessUuid") or str(uuid.uuid4()) + priv, pub = generate_x25519(api) creds = { - "uuid": str(uuid.uuid4()), + "uuid": cascade_uuid, "priv": priv, "pub": pub, "short_id": secrets.token_hex(8), @@ -669,6 +674,7 @@ def main() -> int: api, node_cfg, cfg.get("profile_templates", {}), cascade_creds, changes ) inbound_uuids.append(inbound_uuid) + inbound_uuids.extend(extra_inbound_uuids) sync_node_and_host( api, node_cfg, diff --git a/ansible/roles/core-net/remnawave/tasks/sync.yml b/ansible/roles/core-net/remnawave/tasks/sync.yml index d4ca7a5..cb527d4 100644 --- a/ansible/roles/core-net/remnawave/tasks/sync.yml +++ b/ansible/roles/core-net/remnawave/tasks/sync.yml @@ -51,9 +51,15 @@ RW_API_TOKEN: "{{ remnawave_api_token }}" NB_API_TOKEN: "{{ lookup('env', 'NETBIRD_API_TOKEN', default='') }}" register: remnawave_sync_raw - changed_when: (remnawave_sync_raw.stdout | from_json).changed + changed_when: remnawave_sync_raw.rc == 0 and (remnawave_sync_raw.stdout | from_json).changed + failed_when: false no_log: true +- name: Показать ошибку sync_remnawave.py без секретов + ansible.builtin.fail: + msg: "sync_remnawave.py failed (rc={{ remnawave_sync_raw.rc }}): {{ remnawave_sync_raw.stderr | default('') }}" + when: remnawave_sync_raw.rc != 0 + - name: Разобрать результат синхронизации Remnawave ansible.builtin.set_fact: remnawave_sync: "{{ remnawave_sync_raw.stdout | from_json }}"