revert: roll back IPv6 cascade and rus-central remnanode to IPv4 setup
ansible-deploy / plan (push) Successful in 2s
ansible-lint / lint (push) Successful in 3s
ansible-deploy / deploy (core-net, ) (push) Failing after 32s
ansible-deploy / deploy (ger-nod-02, ) (push) Successful in 4m21s
ansible-deploy / deploy (opnsense, ) (push) Failing after 13s
ansible-deploy / deploy (rus-central, ) (push) Successful in 1m31s
ansible-deploy / plan (push) Successful in 2s
ansible-lint / lint (push) Successful in 3s
ansible-deploy / deploy (core-net, ) (push) Failing after 32s
ansible-deploy / deploy (ger-nod-02, ) (push) Successful in 4m21s
ansible-deploy / deploy (opnsense, ) (push) Failing after 13s
ansible-deploy / deploy (rus-central, ) (push) Successful in 1m31s
This commit is contained in:
1 parent
571f5cb169
commit
f218ca85e1
13 files changed
+42
-381
No files matched your search
@@ -52,9 +52,9 @@
|
||||
ansible.builtin.set_fact:
|
||||
remnanode_cf_zone_id: "{{ (cf_zones.json.result | first).id }}"
|
||||
|
||||
- name: Найти существующую DNS-запись SelfSteal ({{ remnanode_dns_record_type }})
|
||||
- name: Найти существующую A-запись SelfSteal
|
||||
ansible.builtin.uri:
|
||||
url: "https://api.cloudflare.com/client/v4/zones/{{ remnanode_cf_zone_id }}/dns_records?type={{ remnanode_dns_record_type }}&name={{ remnanode_selfsteal_domain }}"
|
||||
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
|
||||
@@ -63,19 +63,18 @@
|
||||
register: cf_dns_lookup
|
||||
no_log: true
|
||||
|
||||
- name: Найти старую A-запись SelfSteal (если AAAA)
|
||||
- name: Найти старую AAAA-запись SelfSteal
|
||||
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=AAAA&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"
|
||||
register: cf_old_aaaa_lookup
|
||||
no_log: true
|
||||
|
||||
- name: Удалить старую A-запись SelfSteal при переходе на IPv6-only
|
||||
- name: Удалить старую AAAA-запись SelfSteal
|
||||
ansible.builtin.uri:
|
||||
url: "https://api.cloudflare.com/client/v4/zones/{{ remnanode_cf_zone_id }}/dns_records/{{ item.id }}"
|
||||
method: DELETE
|
||||
@@ -83,13 +82,10 @@
|
||||
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
|
||||
loop: "{{ cf_old_aaaa_lookup.json.result | default([]) }}"
|
||||
no_log: true
|
||||
|
||||
- name: Создать DNS-запись SelfSteal ({{ remnanode_dns_record_type }})
|
||||
- name: Создать A-запись SelfSteal
|
||||
ansible.builtin.uri:
|
||||
url: "https://api.cloudflare.com/client/v4/zones/{{ remnanode_cf_zone_id }}/dns_records"
|
||||
method: POST
|
||||
@@ -98,16 +94,16 @@
|
||||
Content-Type: application/json
|
||||
body_format: json
|
||||
body:
|
||||
type: "{{ remnanode_dns_record_type }}"
|
||||
type: A
|
||||
name: "{{ remnanode_selfsteal_domain }}"
|
||||
content: "{{ remnanode_public_ip }}"
|
||||
content: "{{ ansible_host }}"
|
||||
ttl: 120
|
||||
proxied: false
|
||||
status_code: [200, 201]
|
||||
when: (cf_dns_lookup.json.result | length) == 0
|
||||
no_log: true
|
||||
|
||||
- name: Обновить DNS-запись SelfSteal ({{ remnanode_dns_record_type }})
|
||||
- name: Обновить A-запись SelfSteal
|
||||
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
|
||||
@@ -116,16 +112,16 @@
|
||||
Content-Type: application/json
|
||||
body_format: json
|
||||
body:
|
||||
type: "{{ remnanode_dns_record_type }}"
|
||||
type: A
|
||||
name: "{{ remnanode_selfsteal_domain }}"
|
||||
content: "{{ remnanode_public_ip }}"
|
||||
content: "{{ ansible_host }}"
|
||||
ttl: 120
|
||||
proxied: false
|
||||
status_code: 200
|
||||
when: >-
|
||||
(cf_dns_lookup.json.result | length) > 0 and
|
||||
(
|
||||
(cf_dns_lookup.json.result | first).content != remnanode_public_ip or
|
||||
(cf_dns_lookup.json.result | first).content != ansible_host or
|
||||
(cf_dns_lookup.json.result | first).proxied
|
||||
)
|
||||
no_log: true
|
||||
@@ -159,27 +155,15 @@
|
||||
path: /root/.secrets/cloudflare.ini
|
||||
state: absent
|
||||
|
||||
- name: Разрешить HTTP для Let's Encrypt HTTP-01 (dual-stack)
|
||||
- name: Разрешить HTTP для Let's Encrypt HTTP-01
|
||||
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: >
|
||||
certbot certonly
|
||||
--standalone
|
||||
--http-01-address {{ remnanode_public_ip }}
|
||||
--non-interactive
|
||||
--agree-tos
|
||||
--email {{ remnanode_letsencrypt_email }}
|
||||
@@ -215,21 +199,6 @@
|
||||
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: |
|
||||
@@ -256,9 +225,7 @@
|
||||
ufw allow from {{ remnanode_panel_nb.stdout | trim }} to any port {{ remnanode_node_port }} proto tcp
|
||||
register: ufw_node_nb
|
||||
changed_when: "'added' in (ufw_node_nb.stdout | lower)"
|
||||
when:
|
||||
- not (remnanode_allow_panel_wan | bool)
|
||||
- remnanode_panel_nb.stdout | default('') | trim is match('^[0-9.]+$')
|
||||
when: remnanode_panel_nb.stdout | default('') | trim is match('^[0-9.]+$')
|
||||
|
||||
- name: Убрать WAN-доступ к NODE_PORT
|
||||
ansible.builtin.command: >
|
||||
@@ -267,9 +234,7 @@
|
||||
register: ufw_node_wan_del
|
||||
changed_when: "'deleted' in (stdout | default('') | lower)"
|
||||
failed_when: false
|
||||
when:
|
||||
- not (remnanode_allow_panel_wan | bool)
|
||||
- remnanode_panel_nb.stdout | default('') | trim is match('^[0-9.]+$')
|
||||
when: remnanode_panel_nb.stdout | default('') | trim is match('^[0-9.]+$')
|
||||
|
||||
- name: Разрешить NODE_PORT только с egress панели (оба провайдера)
|
||||
ansible.builtin.command: >
|
||||
@@ -277,7 +242,7 @@
|
||||
loop: "{{ remnanode_panel_egress_ips }}"
|
||||
register: ufw_node
|
||||
changed_when: "'added' in (stdout | default('') | lower)"
|
||||
when: (remnanode_allow_panel_wan | bool) or (remnanode_panel_nb.stdout | default('') | trim is not match('^[0-9.]+$'))
|
||||
when: remnanode_panel_nb.stdout | default('') | trim is not match('^[0-9.]+$')
|
||||
|
||||
- name: Включить firewall
|
||||
ansible.builtin.command: ufw --force enable
|
||||
@@ -301,7 +266,7 @@
|
||||
- name: Дождаться 443 после конфига с панели
|
||||
ansible.builtin.wait_for:
|
||||
port: 443
|
||||
host: "{{ remnanode_wait_host }}"
|
||||
host: 127.0.0.1
|
||||
timeout: 180
|
||||
register: remnanode_wait_443
|
||||
failed_when: false
|
||||
|
||||
Reference in new issue
Block a user