feat(ger-nod-02,remnawave): move ger-nod-02 SelfSteal & Xray strictly to IPv6 (AAAA)
ansible-deploy / plan (push) Successful in 2s
ansible-lint / lint (push) Successful in 3s
ansible-deploy / deploy (core-net, ) (push) Successful in 18s
ansible-deploy / deploy (ger-nod-02, ) (push) Successful in 1m19s
ansible-deploy / deploy (rus-central, ) (push) Successful in 40s

This commit is contained in:
karpenok committed 2026-11-18 14:12:53 +07:00
1 parent e03bd49077
commit 028deea531
7 files changed
+96 -35

No files matched your search

@@ -6,6 +6,9 @@ remnanode_node_port: 2222
remnanode_public_ip: "{{ ansible_host }}"
remnanode_wait_host: "127.0.0.1"
remnanode_allow_panel_wan: false
remnanode_dns_record_type: "A"
remnanode_ipv6_only: false
remnanode_cascade_allowed_ips: []
remnanode_selfsteal_domain: "yali.gunis.top"
remnanode_xhttp_path: "/xhttp-yali"
+59 -7
View File
@@ -52,9 +52,9 @@
ansible.builtin.set_fact:
remnanode_cf_zone_id: "{{ (cf_zones.json.result | first).id }}"
- name: Найти существующую A-запись SelfSteal
- name: Найти существующую DNS-запись SelfSteal ({{ remnanode_dns_record_type }})
ansible.builtin.uri:
url: "https://api.cloudflare.com/client/v4/zones/{{ remnanode_cf_zone_id }}/dns_records?type=A&name={{ remnanode_selfsteal_domain }}"
url: "https://api.cloudflare.com/client/v4/zones/{{ remnanode_cf_zone_id }}/dns_records?type={{ remnanode_dns_record_type }}&name={{ remnanode_selfsteal_domain }}"
headers:
Authorization: "Bearer {{ remnanode_cloudflare_api }}"
Content-Type: application/json
@@ -63,7 +63,33 @@
register: cf_dns_lookup
no_log: true
- name: Создать A-запись SelfSteal
- name: Найти старую A-запись SelfSteal (если AAAA)
ansible.builtin.uri:
url: "https://api.cloudflare.com/client/v4/zones/{{ remnanode_cf_zone_id }}/dns_records?type=A&name={{ remnanode_selfsteal_domain }}"
headers:
Authorization: "Bearer {{ remnanode_cloudflare_api }}"
Content-Type: application/json
return_content: true
status_code: 200
register: cf_old_a_lookup
when: remnanode_dns_record_type == "AAAA"
no_log: true
- name: Удалить старую A-запись SelfSteal при переходе на IPv6-only
ansible.builtin.uri:
url: "https://api.cloudflare.com/client/v4/zones/{{ remnanode_cf_zone_id }}/dns_records/{{ item.id }}"
method: DELETE
headers:
Authorization: "Bearer {{ remnanode_cloudflare_api }}"
Content-Type: application/json
status_code: 200
loop: "{{ (cf_old_a_lookup.json.result | default([])) }}"
when:
- remnanode_dns_record_type == "AAAA"
- cf_old_a_lookup is defined
no_log: true
- name: Создать DNS-запись SelfSteal ({{ remnanode_dns_record_type }})
ansible.builtin.uri:
url: "https://api.cloudflare.com/client/v4/zones/{{ remnanode_cf_zone_id }}/dns_records"
method: POST
@@ -72,7 +98,7 @@
Content-Type: application/json
body_format: json
body:
type: A
type: "{{ remnanode_dns_record_type }}"
name: "{{ remnanode_selfsteal_domain }}"
content: "{{ remnanode_public_ip }}"
ttl: 120
@@ -81,7 +107,7 @@
when: (cf_dns_lookup.json.result | length) == 0
no_log: true
- name: Обновить A-запись SelfSteal
- name: Обновить DNS-запись SelfSteal ({{ remnanode_dns_record_type }})
ansible.builtin.uri:
url: "https://api.cloudflare.com/client/v4/zones/{{ remnanode_cf_zone_id }}/dns_records/{{ (cf_dns_lookup.json.result | first).id }}"
method: PUT
@@ -90,7 +116,7 @@
Content-Type: application/json
body_format: json
body:
type: A
type: "{{ remnanode_dns_record_type }}"
name: "{{ remnanode_selfsteal_domain }}"
content: "{{ remnanode_public_ip }}"
ttl: 120
@@ -133,10 +159,21 @@
path: /root/.secrets/cloudflare.ini
state: absent
- name: Разрешить HTTP для Let's Encrypt HTTP-01
- name: Разрешить HTTP для Let's Encrypt HTTP-01 (dual-stack)
ansible.builtin.command: ufw allow 80/tcp
register: ufw_http
changed_when: "'added' in (ufw_http.stdout | lower)"
when: not (remnanode_ipv6_only | bool)
- name: Закрыть общий 80/tcp и открыть 80/tcp только для IPv6 (HTTP-01)
ansible.builtin.command: "{{ item }}"
loop:
- ufw --force delete allow 80/tcp
- "ufw allow from ::/0 to {{ remnanode_public_ip }} port 80 proto tcp"
register: ufw_http_v6
changed_when: "'added' in (ufw_http_v6.stdout | lower)"
failed_when: false
when: remnanode_ipv6_only | bool
- name: Выпустить/обновить сертификат через HTTP-01 (без TXT в Cloudflare)
ansible.builtin.command: >
@@ -178,6 +215,21 @@
ansible.builtin.command: ufw allow 443/tcp
register: ufw_https
changed_when: "'added' in (ufw_https.stdout | lower)"
when: not (remnanode_ipv6_only | bool)
- name: Закрыть общий 443/tcp и открыть 443/tcp только для разрешённых IPv6-каскадов
ansible.builtin.command: ufw --force delete allow 443/tcp
register: ufw_https_del
changed_when: "'deleted' in (ufw_https_del.stdout | lower)"
failed_when: false
when: remnanode_ipv6_only | bool
- name: Разрешить 443/tcp только с входных IPv6 каскада
ansible.builtin.command: "ufw allow from {{ item }} to {{ remnanode_public_ip }} port 443 proto tcp"
loop: "{{ remnanode_cascade_allowed_ips }}"
register: ufw_https_v6
changed_when: "'added' in (ufw_https_v6.stdout | lower)"
when: remnanode_ipv6_only | bool
- name: Узнать NetBird IP панели
ansible.builtin.shell: |