From 68ceb859d91d29b956a5bbdfa1db0cf08ca4fdce Mon Sep 17 00:00:00 2001 From: Roman Buryan Date: Fri, 25 Sep 2026 11:17:49 +0300 Subject: [PATCH] Sprint A: vault nginx rewrite (clean config, oauth2-proxy port 8001) --- ops/sprintA/vault-arch-diag.sh | 24 ++++++++++++++++ ops/sprintA/vault-diag.sh | 18 ++++++++++++ ops/sprintA/vault-fix.sh | 33 ++++++++++++++++++++++ ops/sprintA/vault-proxy-fix.sh | 24 ++++++++++++++++ ops/sprintA/vault-rewrite.sh | 51 ++++++++++++++++++++++++++++++++++ 5 files changed, 150 insertions(+) create mode 100755 ops/sprintA/vault-arch-diag.sh create mode 100755 ops/sprintA/vault-diag.sh create mode 100755 ops/sprintA/vault-fix.sh create mode 100755 ops/sprintA/vault-proxy-fix.sh create mode 100755 ops/sprintA/vault-rewrite.sh diff --git a/ops/sprintA/vault-arch-diag.sh b/ops/sprintA/vault-arch-diag.sh new file mode 100755 index 0000000..c877a24 --- /dev/null +++ b/ops/sprintA/vault-arch-diag.sh @@ -0,0 +1,24 @@ +#!/bin/bash +echo "=== 1. Какие порты слушают оба контейнера ===" +pct exec 109 -- docker ps --format "table {{.Names}}\t{{.Ports}}" | grep -E "vault|oauth" + +echo "" +echo "=== 2. Тест: прямой curl в oauth2-proxy vs vaultwarden ===" +pct exec 109 -- bash -c ' + echo "oauth2-proxy ports:" + docker inspect oauth2-proxy-vaultwarden 2>/dev/null | grep -A5 "HostConfig" | grep -A3 "PortBindings" | head -6 + echo "" + echo "vaultwarden ports:" + docker inspect vaultwarden 2>/dev/null | grep -A5 "HostConfig" | grep -A3 "PortBindings" | head -6 +' + +echo "" +echo "=== 3. Тест curl в разные порты CT109 ===" +for port in 8080 8081 8001 4180; do + code=$(pct exec 109 -- curl -s -o /dev/null -w "%{http_code}" -m 3 "http://127.0.0.1:$port/" 2>/dev/null || echo "000") + echo " CT109:$port -> $code" +done + +echo "" +echo "=== 4. Логи oauth2-proxy (последние ошибки) ===" +pct exec 109 -- docker logs oauth2-proxy-vaultwarden --tail 10 2>&1 | tail -15 diff --git a/ops/sprintA/vault-diag.sh b/ops/sprintA/vault-diag.sh new file mode 100755 index 0000000..5450502 --- /dev/null +++ b/ops/sprintA/vault-diag.sh @@ -0,0 +1,18 @@ +#!/bin/bash +echo "=== 1. Последние heartbeat vault (текст ошибки) ===" +pct exec 107 -- sqlite3 -column /opt/network-lxc/uptime/data/kuma.db \ + "SELECT datetime(time) t, status, msg FROM heartbeat + WHERE monitor_id=(SELECT id FROM monitor WHERE name='vault.buryans.ru') + ORDER BY time DESC LIMIT 5;" + +echo "" +echo "=== 2. curl из CT107 (глазами Kuma) ===" +pct exec 107 -- curl -s -o /dev/null -w "code=%{http_code} redirect=%{redirect_url}\n" -m 15 https://vault.buryans.ru/ + +echo "" +echo "=== 3. curl с VPS + напрямую в бэкенд ===" +ssh root@193.233.210.184 'curl -s -o /dev/null -w "public=%{http_code}\n" -m 15 https://vault.buryans.ru/; curl -s -o /dev/null -w "backend_109_8080=%{http_code}\n" -m 10 http://192.168.1.109:8080/' + +echo "" +echo "=== 4. Что реально слушает CT109 ===" +pct exec 109 -- ss -tlnp | grep LISTEN | head -6 diff --git a/ops/sprintA/vault-fix.sh b/ops/sprintA/vault-fix.sh new file mode 100755 index 0000000..82a9bbd --- /dev/null +++ b/ops/sprintA/vault-fix.sh @@ -0,0 +1,33 @@ +#!/bin/bash +set -e + +echo "=== 1. Env переменные Vaultwarden (CT109) ===" +pct exec 109 -- bash -c 'docker inspect vaultwarden 2>/dev/null | jq -r ".[0].Config.Env[]" | grep -E "DOMAIN|ROCKET" || echo "vaultwarden не найден"; docker ps --format "{{.Names}}" | grep -i vault' + +echo "" +echo "=== 2. Тест: прямой curl с заголовками nginx ===" +ssh root@193.233.210.184 'curl -s -o /dev/null -w "code=%{http_code}\n" -m 10 \ + -H "Host: vault.buryans.ru" \ + -H "X-Forwarded-Proto: https" \ + -H "X-Forwarded-Host: vault.buryans.ru" \ + http://192.168.1.109:8080/' + +echo "" +echo "=== 3. Текущий nginx конфиг vault (location /) ===" +ssh root@193.233.210.184 'grep -A 10 "location /" /etc/nginx/sites-available/vault.buryans.ru | tail -11' + +echo "" +echo "=== 4. Фикс: добавляем proxy_redirect off + явный Host ===" +ssh root@193.233.210.184 'if ! grep -q "proxy_redirect off" /etc/nginx/sites-available/vault.buryans.ru; then + sed -i "/proxy_pass http:\/\/192.168.1.109:8080;/a\\ + proxy_redirect off;\\ + proxy_set_header Host vault.buryans.ru;" /etc/nginx/sites-available/vault.buryans.ru + nginx -t && systemctl reload nginx && echo "nginx reloaded" +else + echo "proxy_redirect off уже есть" +fi' + +echo "" +echo "=== 5. Проверка после фикса ===" +sleep 3 +curl -s -o /dev/null -w "public=%{http_code}\n" -m 10 https://vault.buryans.ru/ diff --git a/ops/sprintA/vault-proxy-fix.sh b/ops/sprintA/vault-proxy-fix.sh new file mode 100755 index 0000000..3b755a5 --- /dev/null +++ b/ops/sprintA/vault-proxy-fix.sh @@ -0,0 +1,24 @@ +#!/bin/bash +set -e + +echo "=== 1. Текущий proxy_pass в vault nginx ===" +ssh root@193.233.210.184 'grep "proxy_pass" /etc/nginx/sites-available/vault.buryans.ru' + +echo "" +echo "=== 2. Правим: 8080 → 8001 (oauth2-proxy) ===" +ssh root@193.233.210.184 'sed -i "s|proxy_pass http://192.168.1.109:8080;|proxy_pass http://192.168.1.109:8001;|" /etc/nginx/sites-available/vault.buryans.ru' + +echo "" +echo "=== 3. Тест nginx config + reload ===" +ssh root@193.233.210.184 'nginx -t && systemctl reload nginx && echo "nginx reloaded"' + +echo "" +echo "=== 4. Проверка: curl с VPS ===" +ssh root@193.233.210.184 'curl -s -o /dev/null -w "code=%{http_code}\n" -m 10 https://vault.buryans.ru/' + +echo "" +echo "=== 5. Проверка: curl из CT107 (глазами Kuma) ===" +pct exec 107 -- curl -s -o /dev/null -w "code=%{http_code}\n" -m 10 https://vault.buryans.ru/ + +echo "" +echo "✅ Готово. Через 1-2 минуты монитор vault должен стать зелёным (302 = OK)" diff --git a/ops/sprintA/vault-rewrite.sh b/ops/sprintA/vault-rewrite.sh new file mode 100755 index 0000000..ab72456 --- /dev/null +++ b/ops/sprintA/vault-rewrite.sh @@ -0,0 +1,51 @@ +#!/bin/bash +set -e + +echo "=== 1. Бэкап текущего файла ===" +ssh root@193.233.210.184 'cp /etc/nginx/sites-available/vault.buryans.ru /root/vault.buryans.ru.bak-$(date +%H%M%S)' + +echo "" +echo "=== 2. Перезаписываем файл правильно ===" +ssh root@193.233.210.184 'cat > /etc/nginx/sites-available/vault.buryans.ru << '"'"'NGINX'"'"' +server { + listen 80; + listen [::]:80; + server_name vault.buryans.ru; + return 301 https://$host$request_uri; +} + +server { + listen 443 ssl; + http2 on; + 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:8001; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header Host vault.buryans.ru; + 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 vault.buryans.ru; + proxy_redirect off; + proxy_buffering off; + proxy_request_buffering off; + proxy_read_timeout 3600s; + proxy_send_timeout 3600s; + } +} +NGINX' + +echo "" +echo "=== 3. Test + reload ===" +ssh root@193.233.210.184 'nginx -t && systemctl reload nginx && echo OK' + +echo "" +echo "=== 4. Curl tests ===" +ssh root@193.233.210.184 'curl -s -o /dev/null -w "VPS: code=%{http_code}\n" -m 10 https://vault.buryans.ru/' +pct exec 107 -- curl -s -o /dev/null -w "CT107: code=%{http_code}\n" -m 10 https://vault.buryans.ru/