From cc020fbcd21cb9561ae66ac951b8150fb22c58e3 Mon Sep 17 00:00:00 2001 From: Roman Buryan Date: Fri, 25 Sep 2026 11:01:51 +0300 Subject: [PATCH] Sprint A: 15 monitors + fixes (vault cert, headscale 404, port types) --- ops/sprintA/sprintA-fix-monitors.sh | 17 +++++++++++++++ ops/sprintA/sprintA-fix2.sh | 28 +++++++++++++++++++++++++ ops/sprintA/sprintA-fix3.sh | 32 +++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+) create mode 100755 ops/sprintA/sprintA-fix-monitors.sh create mode 100755 ops/sprintA/sprintA-fix2.sh create mode 100755 ops/sprintA/sprintA-fix3.sh diff --git a/ops/sprintA/sprintA-fix-monitors.sh b/ops/sprintA/sprintA-fix-monitors.sh new file mode 100755 index 0000000..ec22ee0 --- /dev/null +++ b/ops/sprintA/sprintA-fix-monitors.sh @@ -0,0 +1,17 @@ +#!/bin/bash +set -e +KUMADB="/opt/network-lxc/uptime/data/kuma.db" +PVE_IP=$(hostname -I | awk '{print $1}') +echo "PVE IP: $PVE_IP" + +pct exec 107 -- docker stop uptime_kuma >/dev/null + +pct exec 107 -- sqlite3 "$KUMADB" "UPDATE monitor SET method='GET' WHERE name='Gitea (140)';" +pct exec 107 -- sqlite3 "$KUMADB" "UPDATE monitor SET type='port' WHERE name='Postgres (CT 151)';" +pct exec 107 -- sqlite3 "$KUMADB" "UPDATE monitor SET url='https://$PVE_IP:8006' WHERE name LIKE 'Proxmox%';" +pct exec 107 -- sqlite3 "$KUMADB" "UPDATE monitor SET name='VPS TCP 443', type='port', hostname='193.233.210.184', port=443, url=NULL WHERE name='VPS ping';" + +pct exec 107 -- docker start uptime_kuma >/dev/null +sleep 5 +echo "=== Итог ===" +pct exec 107 -- sqlite3 -header -column "$KUMADB" "SELECT id,name,type,url,hostname,port,method FROM monitor ORDER BY id;" diff --git a/ops/sprintA/sprintA-fix2.sh b/ops/sprintA/sprintA-fix2.sh new file mode 100755 index 0000000..203b4f8 --- /dev/null +++ b/ops/sprintA/sprintA-fix2.sh @@ -0,0 +1,28 @@ +#!/bin/bash +set -e + +echo "=== 1. vault: структура файла (до правки) ===" +ssh root@193.233.210.184 'grep -n "listen\|server_name\|ssl_certificate" /etc/nginx/sites-available/vault.buryans.ru' + +echo "" +echo "=== 2. vault: возвращаем listen 443 в SSL-блок ===" +ssh root@193.233.210.184 'if ! grep -q "listen 443" /etc/nginx/sites-available/vault.buryans.ru; then + sed -i "s|ssl_certificate /etc/letsencrypt/live/vault.buryans.ru/fullchain.pem;|listen 443 ssl http2;\n ssl_certificate /etc/letsencrypt/live/vault.buryans.ru/fullchain.pem;|" /etc/nginx/sites-available/vault.buryans.ru + echo "listen 443 добавлен" +else + echo "listen 443 уже есть - правка не нужна" +fi +nginx -t && systemctl reload nginx && echo "nginx reloaded"' + +echo "" +echo "=== 3. Проверка сертификата vault ===" +curl -sv -o /dev/null https://vault.buryans.ru 2>&1 | grep -E "subject:|SSL connection" | head -3 + +echo "" +echo "=== 4. headscale: 404 = норма (API без веб-страницы) ===" +pct exec 107 -- docker stop uptime_kuma >/dev/null +pct exec 107 -- sqlite3 /opt/network-lxc/uptime/data/kuma.db \ + "UPDATE monitor SET accepted_statuscodes_json='[\"200-299\",\"404\"]' WHERE name='headscale.buryans.ru';" +pct exec 107 -- docker start uptime_kuma >/dev/null +sleep 4 +echo "✅ готово" diff --git a/ops/sprintA/sprintA-fix3.sh b/ops/sprintA/sprintA-fix3.sh new file mode 100755 index 0000000..656ff4b --- /dev/null +++ b/ops/sprintA/sprintA-fix3.sh @@ -0,0 +1,32 @@ +#!/bin/bash +set -e + +echo "=== 1. Аудит: у всех доменов есть listen 443? ===" +ssh root@193.233.210.184 'for f in /etc/nginx/sites-enabled/*.buryans.ru; do printf "%-28s listen443: %s\n" "$(basename $f)" "$(grep -c "listen 443" $f)"; done' + +echo "" +echo "=== 2. Дописываем полный 443-блок в vault ===" +ssh root@193.233.210.184 'cat >> /etc/nginx/sites-available/vault.buryans.ru << '"'"'BLK'"'"' + +server { + listen 443 ssl http2; + server_name vault.buryans.ru; + + ssl_certificate /etc/letsencrypt/live/vault.buryans.ru/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/vault.buryans.ru/privkey.pem; + + location / { + proxy_pass http://192.168.1.109:8080; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Host $host; + } +} +BLK +nginx -t && systemctl reload nginx && echo "nginx reloaded"' + +echo "" +echo "=== 3. Проверка: чей сертификат теперь отдаёт vault ===" +curl -sv -o /dev/null https://vault.buryans.ru 2>&1 | grep -E "subject:" | head -2