fix(ger-nod-02): пароль как у central, HTTP-01 без ACME TXT, кавычки SECRET_KEY
ansible-rus-central / deploy (push) Canceled after 0s
ansible-opnsense / deploy (push) Canceled after 0s
ansible-core-secrets / deploy (push) Canceled after 0s
ansible-core-net / deploy (push) Canceled after 0s
ansible-core-mon / deploy (push) Canceled after 24s
ansible-ger-nod-02 / deploy (push) Successful in 4m1s
ansible-rus-central / deploy (push) Canceled after 0s
ansible-opnsense / deploy (push) Canceled after 0s
ansible-core-secrets / deploy (push) Canceled after 0s
ansible-core-net / deploy (push) Canceled after 0s
ansible-core-mon / deploy (push) Canceled after 24s
ansible-ger-nod-02 / deploy (push) Successful in 4m1s
Падение было на :443 — SECRET_KEY без кавычек ломал ноду. DNS-01 убран: LE через standalone HTTP-01, старые _acme-challenge чистим. ansible_password только из /VPS; host в плейбуке как у rus-central. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
0f7fe4e352
commit
0a56b935de
5 files changed
+82
-35
No files matched your search
@@ -14,7 +14,6 @@
|
||||
- jq
|
||||
- ufw
|
||||
- certbot
|
||||
- python3-certbot-dns-cloudflare
|
||||
state: present
|
||||
update_cache: true
|
||||
|
||||
@@ -29,7 +28,6 @@
|
||||
- { path: "{{ remnanode_dir }}", mode: "0755" }
|
||||
- { path: "{{ remnanode_www_dir }}", mode: "0755" }
|
||||
- { path: /etc/letsencrypt, mode: "0755" }
|
||||
- { path: /root/.secrets, mode: "0700" }
|
||||
|
||||
- name: Положить маскировочный сайт SelfSteal
|
||||
ansible.builtin.copy:
|
||||
@@ -39,16 +37,6 @@
|
||||
group: root
|
||||
mode: "0644"
|
||||
|
||||
- name: Записать Cloudflare credentials для certbot
|
||||
ansible.builtin.copy:
|
||||
dest: /root/.secrets/cloudflare.ini
|
||||
content: |
|
||||
dns_cloudflare_api_token = {{ remnanode_cloudflare_api }}
|
||||
owner: root
|
||||
group: root
|
||||
mode: "0600"
|
||||
no_log: true
|
||||
|
||||
- name: Узнать Zone ID gunis.top
|
||||
ansible.builtin.uri:
|
||||
url: "https://api.cloudflare.com/client/v4/zones?name={{ remnanode_cloudflare_zone }}"
|
||||
@@ -116,17 +104,50 @@
|
||||
)
|
||||
no_log: true
|
||||
|
||||
- name: Выпустить/обновить сертификат через Cloudflare DNS-01
|
||||
- name: Найти мусорные ACME TXT от старого DNS-01
|
||||
ansible.builtin.uri:
|
||||
url: "https://api.cloudflare.com/client/v4/zones/{{ remnanode_cf_zone_id }}/dns_records?type=TXT&name=_acme-challenge.{{ remnanode_selfsteal_domain }}"
|
||||
headers:
|
||||
Authorization: "Bearer {{ remnanode_cloudflare_api }}"
|
||||
Content-Type: application/json
|
||||
return_content: true
|
||||
status_code: 200
|
||||
register: cf_acme_txt
|
||||
no_log: true
|
||||
|
||||
- name: Удалить мусорные ACME TXT
|
||||
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, 201]
|
||||
loop: "{{ cf_acme_txt.json.result | default([]) }}"
|
||||
loop_control:
|
||||
label: "{{ item.name | default(item.id) }}"
|
||||
no_log: true
|
||||
|
||||
- name: Убрать credentials DNS-01 certbot, если остались
|
||||
ansible.builtin.file:
|
||||
path: /root/.secrets/cloudflare.ini
|
||||
state: absent
|
||||
|
||||
- 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)"
|
||||
|
||||
- name: Выпустить/обновить сертификат через HTTP-01 (без TXT в Cloudflare)
|
||||
ansible.builtin.command: >
|
||||
certbot certonly
|
||||
--dns-cloudflare
|
||||
--dns-cloudflare-credentials /root/.secrets/cloudflare.ini
|
||||
--dns-cloudflare-propagation-seconds 30
|
||||
--standalone
|
||||
--non-interactive
|
||||
--agree-tos
|
||||
--email {{ remnanode_letsencrypt_email }}
|
||||
-d {{ remnanode_selfsteal_domain }}
|
||||
--keep-until-expiring
|
||||
--preferred-challenges http
|
||||
register: remnanode_certbot
|
||||
changed_when: "'Certificate not yet due for renewal' not in remnanode_certbot.stdout"
|
||||
|
||||
@@ -176,13 +197,41 @@
|
||||
'Recreated' in remnanode_up.stderr or
|
||||
'Pulled' in remnanode_up.stderr
|
||||
|
||||
- name: Проверить, что Xray слушает 443
|
||||
ansible.builtin.shell: ss -tulpn | grep -E ':443\\b' || true
|
||||
register: remnanode_ss
|
||||
- name: Дождаться NODE_PORT (панель → нода)
|
||||
ansible.builtin.wait_for:
|
||||
port: "{{ remnanode_node_port }}"
|
||||
host: 127.0.0.1
|
||||
timeout: 60
|
||||
|
||||
- name: Дождаться 443 после конфига с панели
|
||||
ansible.builtin.wait_for:
|
||||
port: 443
|
||||
host: 127.0.0.1
|
||||
timeout: 180
|
||||
register: remnanode_wait_443
|
||||
failed_when: false
|
||||
|
||||
- name: Снять диагностику, если 443 молчит
|
||||
when: remnanode_wait_443 is failed
|
||||
ansible.builtin.shell: |
|
||||
set -eu
|
||||
echo '=== compose ps ==='
|
||||
docker compose -f {{ remnanode_dir }}/compose.yaml ps -a
|
||||
echo '=== remnanode logs ==='
|
||||
docker logs remnanode --tail 80 2>&1 || true
|
||||
echo '=== nginx logs ==='
|
||||
docker logs remnawave-nginx --tail 40 2>&1 || true
|
||||
echo '=== listeners ==='
|
||||
ss -tulpn | head -80 || true
|
||||
register: remnanode_diag
|
||||
changed_when: false
|
||||
retries: 10
|
||||
delay: 3
|
||||
until: "':443' in remnanode_ss.stdout"
|
||||
|
||||
- name: Упасть с диагностикой, если 443 не слушает
|
||||
when: remnanode_wait_443 is failed
|
||||
ansible.builtin.fail:
|
||||
msg: |
|
||||
Xray не слушает :443 (панель должна достучаться до NODE_PORT {{ remnanode_node_port }}).
|
||||
{{ remnanode_diag.stdout | default('') }}
|
||||
|
||||
- name: Итог ноды
|
||||
ansible.builtin.debug:
|
||||
|
||||
Reference in new issue
Block a user