refactor(remnawave,exit-node): split bootstrap/sync and generalize ger-nod-02 roles
ansible-core-net / deploy (push) Successful in 1m50s
ansible-core-mon / deploy (push) Successful in 28s
ansible-core-secrets / deploy (push) Successful in 18s
ansible-ger-nod-02 / deploy (push) Failing after 3s
ansible-opnsense / deploy (push) Successful in 9s
ansible-rus-central / deploy (push) Successful in 1m7s

This commit is contained in:
karpenok committed 2026-11-15 22:31:04 +07:00
1 parent 83baec4bad
commit 2fc6e39323
19 files changed
+1092 -863

No files matched your search

+20
View File
@@ -0,0 +1,20 @@
---
remnanode_dir: /opt/remnanode
remnanode_image: "remnawave/node:latest"
remnanode_nginx_image: "nginx:1.28"
remnanode_node_port: 2222
remnanode_selfsteal_domain: "yali.gunis.top"
remnanode_xhttp_path: "/xhttp-yali"
remnanode_secret_key: "{{ lookup('env', 'REMNANODE_SECRET_KEY', default='') }}"
# 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) }}"
remnanode_www_dir: /var/www/html
remnanode_cert_dir: "/etc/letsencrypt/live/{{ remnanode_selfsteal_domain }}"
@@ -0,0 +1,4 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
<rect width="32" height="32" rx="4" fill="#1c1915"/>
<text x="16" y="22" text-anchor="middle" font-family="Georgia, serif" font-size="16" fill="#f7f4ee">Y</text>
</svg>

After

Width:  |  Height:  |  Size: 234 B

@@ -0,0 +1,136 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="robots" content="noindex,nofollow">
<meta name="description" content="Yali sets type and prepares print files for small publishers and shops in Hamburg.">
<title>Yali — layout for small print</title>
<link rel="icon" href="favicon.svg" type="image/svg+xml">
<style>
:root { color-scheme: light; --ink: #1c1915; --muted: #5c564c; --line: #e4ddd2; --paper: #f7f4ee; }
* { box-sizing: border-box; }
html { scroll-behavior: smooth; }
body {
margin: 0;
background: var(--paper);
color: var(--ink);
font-family: "Iowan Old Style", "Palatino Linotype", Palatino, Georgia, serif;
font-size: 1.05rem;
line-height: 1.55;
}
a { color: inherit; }
header, main, footer { width: min(42rem, calc(100% - 2.5rem)); margin: 0 auto; }
header {
display: flex;
justify-content: space-between;
align-items: baseline;
gap: 1rem;
padding: 1.4rem 0 1rem;
border-bottom: 1px solid var(--line);
}
.mark { font-weight: 600; letter-spacing: 0.01em; text-decoration: none; }
nav { display: flex; gap: 1.1rem; font-family: "Segoe UI", system-ui, sans-serif; font-size: 0.82rem; }
nav a { color: var(--muted); text-decoration: none; }
nav a:hover { color: var(--ink); }
h1 { font-size: 2.15rem; font-weight: 560; letter-spacing: -0.02em; line-height: 1.15; margin: 2.2rem 0 0.8rem; }
.lede { margin: 0 0 2.4rem; max-width: 36rem; }
h2 {
margin: 2.4rem 0 0.8rem;
font-family: "Segoe UI", system-ui, sans-serif;
font-size: 0.75rem;
font-weight: 650;
letter-spacing: 0.08em;
text-transform: uppercase;
color: var(--muted);
}
.jobs { list-style: none; margin: 0; padding: 0; border-top: 1px solid var(--line); }
.jobs li { display: grid; grid-template-columns: 4.2rem 1fr; gap: 0.8rem; padding: 0.85rem 0; border-bottom: 1px solid var(--line); }
.year { font-family: "Segoe UI", system-ui, sans-serif; font-size: 0.82rem; color: var(--muted); padding-top: 0.2rem; }
.jobs strong { font-weight: 600; }
.jobs p { margin: 0.15rem 0 0; color: var(--muted); }
article { padding: 0.9rem 0; border-bottom: 1px solid var(--line); }
article h3 { margin: 0 0 0.3rem; font-size: 1.15rem; }
article p { margin: 0; }
article time { font-family: "Segoe UI", system-ui, sans-serif; font-size: 0.78rem; color: var(--muted); }
footer {
display: flex;
justify-content: space-between;
gap: 1rem;
padding: 1.4rem 0 2.5rem;
font-family: "Segoe UI", system-ui, sans-serif;
font-size: 0.82rem;
color: var(--muted);
}
@media (max-width: 560px) {
.jobs li { grid-template-columns: 1fr; gap: 0.15rem; }
footer { flex-direction: column; }
}
</style>
</head>
<body>
<header>
<a class="mark" href="/">Yali</a>
<nav>
<a href="#work">Work</a>
<a href="#notes">Notes</a>
<a href="#practice">Practice</a>
</nav>
</header>
<main>
<h1>Layout for small print runs.</h1>
<p class="lede">Yali is a one-person practice in Hamburg. I set type, build short pages, and prepare files for publishers and shops that still print on paper.</p>
<h2 id="work">Selected work</h2>
<ul class="jobs">
<li>
<span class="year">2025</span>
<div>
<strong>Field notebook reprint</strong>
<p>Cover, interiors and a colophon for a 96-page notebook. One paper, two inks, no spot varnish.</p>
</div>
</li>
<li>
<span class="year">2024</span>
<div>
<strong>Saturday price sheet</strong>
<p>A single-sided list for an outdoor market stall. Set in one size so it still reads in bad light.</p>
</div>
</li>
<li>
<span class="year">2024</span>
<div>
<strong>Evening programme</strong>
<p>Eight pages for a night of short essays. Titles, running order, and a map that fits in a coat pocket.</p>
</div>
</li>
<li>
<span class="year">2023</span>
<div>
<strong>Shop window cards</strong>
<p>Seasonal cards for a ceramic shop. The type is large enough to read from the pavement.</p>
</div>
</li>
</ul>
<h2 id="notes">Notes</h2>
<article>
<time datetime="2026-03-12">12 March 2026</time>
<h3>Paper for the spring notebook</h3>
<p>The reprint moves to a warmer stock. The cover stays the same weight; only the colour of the sheet changes, so last year’s copies still sit next to the new ones without looking like a different book.</p>
</article>
<article>
<time datetime="2025-11-02">2 November 2025</time>
<h3>One size on the price sheet</h3>
<p>The first version had three sizes and a bold price. On the stall it was slower to scan than a plain list. The current sheet is one size, prices in a column, and the paper is heavy enough that it does not curl in the damp.</p>
</article>
<h2 id="practice">Practice</h2>
<p>Most jobs are a cover, a short interior, or a sheet that has to work in a shop. I take a few of these a year and set them myself. Commissions are closed through 2026; the notes above are the public part of the work.</p>
</main>
<footer>
<span>Yali · Hamburg</span>
<span>Print files, not campaigns</span>
</footer>
</body>
</html>
+284
View File
@@ -0,0 +1,284 @@
---
- name: Проверить SECRET_KEY ноды и Cloudflare API
ansible.builtin.assert:
that:
- remnanode_secret_key | length > 0
- remnanode_cloudflare_api | length > 0
- remnanode_selfsteal_domain | length > 3
fail_msg: "Нужны REMNANODE_SECRET_KEY (/services/remnawave) и CLOUDFLARE_API (/ci-cd). Сначала прогоните core-net/remnawave."
- name: Поставить пакеты ноды
ansible.builtin.apt:
name:
- curl
- jq
- ufw
- certbot
state: present
update_cache: true
- name: Создать каталоги ноды
ansible.builtin.file:
path: "{{ item.path }}"
state: directory
owner: root
group: root
mode: "{{ item.mode }}"
loop:
- { path: "{{ remnanode_dir }}", mode: "0755" }
- { path: "{{ remnanode_www_dir }}", mode: "0755" }
- { path: /etc/letsencrypt, mode: "0755" }
- name: Положить маскировочный сайт SelfSteal
ansible.builtin.copy:
src: site/
dest: "{{ remnanode_www_dir }}/"
owner: root
group: root
mode: "0644"
- name: Узнать Zone ID gunis.top
ansible.builtin.uri:
url: "https://api.cloudflare.com/client/v4/zones?name={{ remnanode_cloudflare_zone }}"
headers:
Authorization: "Bearer {{ remnanode_cloudflare_api }}"
Content-Type: application/json
return_content: true
status_code: 200
register: cf_zones
no_log: true
- name: Извлечь Zone ID
ansible.builtin.set_fact:
remnanode_cf_zone_id: "{{ (cf_zones.json.result | first).id }}"
- name: Найти существующую A-запись SelfSteal
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_dns_lookup
no_log: true
- name: Создать A-запись SelfSteal
ansible.builtin.uri:
url: "https://api.cloudflare.com/client/v4/zones/{{ remnanode_cf_zone_id }}/dns_records"
method: POST
headers:
Authorization: "Bearer {{ remnanode_cloudflare_api }}"
Content-Type: application/json
body_format: json
body:
type: A
name: "{{ remnanode_selfsteal_domain }}"
content: "{{ ansible_host }}"
ttl: 120
proxied: false
status_code: [200, 201]
when: (cf_dns_lookup.json.result | length) == 0
no_log: true
- 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
headers:
Authorization: "Bearer {{ remnanode_cloudflare_api }}"
Content-Type: application/json
body_format: json
body:
type: A
name: "{{ remnanode_selfsteal_domain }}"
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 != ansible_host or
(cf_dns_lookup.json.result | first).proxied
)
no_log: true
- 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
--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"
- name: Записать nginx SelfSteal
ansible.builtin.template:
src: nginx.conf.j2
dest: "{{ remnanode_dir }}/nginx.conf"
owner: root
group: root
mode: "0644"
- name: Записать compose ноды
ansible.builtin.template:
src: compose.yaml.j2
dest: "{{ remnanode_dir }}/compose.yaml"
owner: root
group: root
mode: "0600"
no_log: true
- name: Разрешить SSH
ansible.builtin.command: ufw allow OpenSSH
register: ufw_ssh
changed_when: "'added' in (ufw_ssh.stdout | lower)"
- name: Разрешить HTTPS для клиентов
ansible.builtin.command: ufw allow 443/tcp
register: ufw_https
changed_when: "'added' in (ufw_https.stdout | lower)"
- name: Узнать NetBird IP панели
ansible.builtin.shell: |
set -euo pipefail
if [ -z "${NB_API_TOKEN:-}" ]; then
exit 0
fi
curl -fsS --max-time 20 -H "Authorization: Token ${NB_API_TOKEN}" \
"https://central.gunihome.ru/api/peers" \
| jq -r --arg h "core-net" '
(if type == "array" then . elif type == "object" then (.items // .peers // []) else [] end)
| map(select((.hostname // "") == $h or (.name // "") == $h or (.dns_label // "") == $h))
| .[0].ip // empty'
args:
executable: /bin/bash
environment:
NB_API_TOKEN: "{{ lookup('env', 'NETBIRD_API_TOKEN', default='') }}"
register: remnanode_panel_nb
changed_when: false
failed_when: false
- name: Разрешить NODE_PORT с NetBird IP панели
ansible.builtin.command: >
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: remnanode_panel_nb.stdout | default('') | trim is match('^[0-9.]+$')
- name: Убрать WAN-доступ к NODE_PORT
ansible.builtin.command: >
ufw --force delete allow from {{ item }} to any port {{ remnanode_node_port }} proto tcp
loop: "{{ remnanode_panel_egress_ips }}"
register: ufw_node_wan_del
changed_when: "'deleted' in (stdout | default('') | lower)"
failed_when: false
when: remnanode_panel_nb.stdout | default('') | trim is match('^[0-9.]+$')
- name: Разрешить NODE_PORT только с egress панели (оба провайдера)
ansible.builtin.command: >
ufw allow from {{ item }} to any port {{ remnanode_node_port }} proto tcp
loop: "{{ remnanode_panel_egress_ips }}"
register: ufw_node
changed_when: "'added' in (stdout | default('') | lower)"
when: remnanode_panel_nb.stdout | default('') | trim is not match('^[0-9.]+$')
- name: Включить firewall
ansible.builtin.command: ufw --force enable
changed_when: false
- name: Запустить remnanode + nginx
ansible.builtin.command: docker compose -f {{ remnanode_dir }}/compose.yaml up -d --remove-orphans
register: remnanode_up
changed_when: >-
'Started' in remnanode_up.stderr or
'Created' in remnanode_up.stderr or
'Recreated' in remnanode_up.stderr or
'Pulled' in remnanode_up.stderr
- 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
- 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:
msg:
- "SelfSteal: https://{{ remnanode_selfsteal_domain }}"
- >-
{{
'NODE_PORT ' ~ remnanode_node_port ~ ' только с NetBird панели ' ~ (remnanode_panel_nb.stdout | trim)
if (remnanode_panel_nb.stdout | default('') | trim is match('^[0-9.]+$'))
else 'Peer core-net ещё не в сети, NODE_PORT ' ~ remnanode_node_port ~ ' остаётся с WAN egress ' ~ (remnanode_panel_egress_ips | join(', '))
}}
- "Compose: {{ remnanode_dir }}/compose.yaml"
@@ -0,0 +1,45 @@
services:
remnawave-nginx:
image: {{ remnanode_nginx_image }}
container_name: remnawave-nginx
hostname: remnawave-nginx
restart: always
network_mode: host
volumes:
- ./nginx.conf:/etc/nginx/conf.d/default.conf:ro
- {{ remnanode_cert_dir }}/fullchain.pem:/etc/nginx/ssl/{{ remnanode_selfsteal_domain }}/fullchain.pem:ro
- {{ remnanode_cert_dir }}/privkey.pem:/etc/nginx/ssl/{{ remnanode_selfsteal_domain }}/privkey.pem:ro
- /dev/shm:/dev/shm:rw
- {{ remnanode_www_dir }}:/var/www/html:ro
command: sh -c 'rm -f /dev/shm/nginx.sock && nginx -g "daemon off;"'
depends_on:
- remnanode
logging:
driver: json-file
options:
max-size: 30m
max-file: 5
remnanode:
image: {{ remnanode_image }}
container_name: remnanode
hostname: remnanode
restart: always
network_mode: host
environment:
- NODE_PORT={{ remnanode_node_port }}
# Кавычки обязательны: SECRET_KEY — длинный base64/JSON от панели.
- SECRET_KEY={{ remnanode_secret_key | to_json }}
volumes:
- /dev/shm:/dev/shm:rw
logging:
driver: json-file
options:
max-size: 30m
max-file: 5
cap_add:
- NET_ADMIN
ulimits:
nofile:
soft: 1048576
hard: 1048576
@@ -0,0 +1,51 @@
map $http_upgrade $connection_upgrade {
default upgrade;
"" close;
}
ssl_protocols TLSv1.2 TLSv1.3;
ssl_ecdh_curve X25519:prime256v1:secp384r1;
ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305;
ssl_prefer_server_ciphers on;
ssl_session_timeout 1d;
ssl_session_cache shared:MozSSL:10m;
ssl_session_tickets off;
server {
server_name {{ remnanode_selfsteal_domain }};
listen unix:/dev/shm/nginx.sock ssl proxy_protocol;
http2 on;
ssl_certificate "/etc/nginx/ssl/{{ remnanode_selfsteal_domain }}/fullchain.pem";
ssl_certificate_key "/etc/nginx/ssl/{{ remnanode_selfsteal_domain }}/privkey.pem";
ssl_trusted_certificate "/etc/nginx/ssl/{{ remnanode_selfsteal_domain }}/fullchain.pem";
root /var/www/html;
index index.html;
add_header X-Robots-Tag "noindex, nofollow, noarchive, nosnippet, noimageindex" always;
location / {
try_files $uri $uri/ /index.html;
}
location = {{ remnanode_xhttp_path }} {
default_type text/plain;
add_header Cache-Control "no-store" always;
return 200 "ok";
}
location = {{ remnanode_xhttp_path }}/ {
default_type text/plain;
add_header Cache-Control "no-store" always;
return 200 "ok";
}
}
server {
listen unix:/dev/shm/nginx.sock ssl proxy_protocol default_server;
server_name _;
add_header X-Robots-Tag "noindex, nofollow, noarchive, nosnippet, noimageindex" always;
ssl_reject_handshake on;
return 444;
}