diff --git a/ansible/inventories/prod/host_vars/ger-nod-02.yml b/ansible/inventories/prod/host_vars/ger-nod-02.yml index 1ef39b4..3ecc38b 100644 --- a/ansible/inventories/prod/host_vars/ger-nod-02.yml +++ b/ansible/inventories/prod/host_vars/ger-nod-02.yml @@ -2,4 +2,7 @@ ansible_host: 150.241.64.209 ansible_user: root remnanode_selfsteal_domain: "yali.gunis.top" -remnanode_panel_egress_ip: "185.160.137.140" +# WAN egress панели (core-net): оба провайдера → NODE_PORT +remnanode_panel_egress_ips: + - "213.128.28.107" # провайдер 1 (МТС) + - "185.160.137.140" # провайдер 2 diff --git a/ansible/roles/core-net/remnawave/defaults/main.yml b/ansible/roles/core-net/remnawave/defaults/main.yml index 41eeb76..1a55d64 100644 --- a/ansible/roles/core-net/remnawave/defaults/main.yml +++ b/ansible/roles/core-net/remnawave/defaults/main.yml @@ -38,4 +38,7 @@ remnawave_inbound_tag: "Steal-Yali" remnawave_host_remark: "🇩🇪 Yali" remnawave_api_token_name: "infra-automation" -remnawave_panel_egress_ip: "185.160.137.140" +# Документация WAN egress панели (см. remnanode_panel_egress_ips на ger-nod-02). +remnawave_panel_egress_ips: + - "213.128.28.107" # провайдер 1 (МТС) + - "185.160.137.140" # провайдер 2 diff --git a/ansible/roles/ger-nod-02/remnanode/defaults/main.yml b/ansible/roles/ger-nod-02/remnanode/defaults/main.yml index 56f9c0e..5db37d4 100644 --- a/ansible/roles/ger-nod-02/remnanode/defaults/main.yml +++ b/ansible/roles/ger-nod-02/remnanode/defaults/main.yml @@ -8,7 +8,10 @@ remnanode_selfsteal_domain: "yali.gunis.top" remnanode_xhttp_path: "/xhttp-yali" remnanode_secret_key: "{{ lookup('env', 'REMNANODE_SECRET_KEY', default='') }}" -remnanode_panel_egress_ip: "185.160.137.140" +# WAN egress core-net (панель → NODE_PORT). Оба провайдера. +remnanode_panel_egress_ips: + - "213.128.28.107" # провайдер 1 (МТС) + - "185.160.137.140" # провайдер 2 remnanode_cloudflare_api: "{{ lookup('env', 'CLOUDFLARE_API', default='') }}" remnanode_cloudflare_zone: "gunis.top" remnanode_letsencrypt_email: "{{ lookup('env', 'MAIL_ADMIN_USER', default=letsencrypt_email) }}" diff --git a/ansible/roles/ger-nod-02/remnanode/tasks/main.yml b/ansible/roles/ger-nod-02/remnanode/tasks/main.yml index b005e0c..6ec967a 100644 --- a/ansible/roles/ger-nod-02/remnanode/tasks/main.yml +++ b/ansible/roles/ger-nod-02/remnanode/tasks/main.yml @@ -178,9 +178,10 @@ register: ufw_https changed_when: "'added' in (ufw_https.stdout | lower)" -- name: Разрешить NODE_PORT только с egress панели +- name: Разрешить NODE_PORT только с egress панели (оба провайдера) ansible.builtin.command: > - ufw allow from {{ remnanode_panel_egress_ip }} to any port {{ remnanode_node_port }} proto tcp + ufw allow from {{ item }} to any port {{ remnanode_node_port }} proto tcp + loop: "{{ remnanode_panel_egress_ips }}" register: ufw_node changed_when: "'added' in (ufw_node.stdout | lower)" @@ -237,5 +238,5 @@ ansible.builtin.debug: msg: - "SelfSteal: https://{{ remnanode_selfsteal_domain }}" - - "NODE_PORT {{ remnanode_node_port }} только с {{ remnanode_panel_egress_ip }}" + - "NODE_PORT {{ remnanode_node_port }} только с {{ remnanode_panel_egress_ips | join(', ') }}" - "Compose: {{ remnanode_dir }}/compose.yaml"