From 4ff2bb2c3014dd913f6cd0a29a52f5aebbe3a9bd Mon Sep 17 00:00:00 2001 From: Crimson Date: Tue, 12 May 2026 21:19:08 +0500 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=BA=D1=83=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D1=82=D0=B0=D1=86=D0=B8=D1=8F:=20=D1=83=D0=BD=D0=B8=D1=84?= =?UTF-8?q?=D0=B8=D0=BA=D0=B0=D1=86=D0=B8=D1=8F=20=D0=BF=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=D0=B5=D1=80=D0=BE=D0=BA=20=D0=B4=D0=BB=D1=8F=20amnezia-awg2=20?= =?UTF-8?q?=D0=B8=20amnezia-awg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/ACCEPTANCE_CHECKLIST.md | 2 +- docs/INSTALLATION.md | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/docs/ACCEPTANCE_CHECKLIST.md b/docs/ACCEPTANCE_CHECKLIST.md index b8403d7..1952a97 100644 --- a/docs/ACCEPTANCE_CHECKLIST.md +++ b/docs/ACCEPTANCE_CHECKLIST.md @@ -149,7 +149,7 @@ - [ ] AmneziaDNS установлен из приложения AmneziaVPN. - [ ] Контейнер `amnezia-dns` в состоянии healthy. - [ ] `docker inspect amnezia-dns` показывает `"53/tcp":null` и `"53/udp":null`. -- [ ] `amnezia-dns` и `amnezia-awg2` подключены к одной Amnezia DNS Docker-сети. +- [ ] `amnezia-dns` и активный AWG-контейнер (`amnezia-awg2` или `amnezia-awg`) подключены к одной Amnezia DNS Docker-сети. - [ ] Публичный DNS-запрос к `:53` не резолвит домены; допустимы `connection refused`, `timeout` или `no servers could be reached`. - [ ] DNS-резолвинг у VPN-клиента работает при активном подключении. - [ ] AWG2 host firewall не открывает `53/tcp` и `53/udp`. diff --git a/docs/INSTALLATION.md b/docs/INSTALLATION.md index b62cb55..593cf15 100644 --- a/docs/INSTALLATION.md +++ b/docs/INSTALLATION.md @@ -163,9 +163,12 @@ amnezia-dns amnezia-dns Up ... (healthy) 53/tcp, 53/udp Проверка публикации портов: ```bash +AWG="$(docker ps --format '{{.Names}}' | grep -E '^(amnezia-awg2|amnezia-awg)$' | head -n1)" +echo "AWG=$AWG" + docker inspect -f 'ports={{json .NetworkSettings.Ports}}' amnezia-dns docker inspect -f 'networks={{range $n,$v := .NetworkSettings.Networks}}{{printf "%s=%s " $n $v.IPAddress}}{{end}}' amnezia-dns -docker inspect -f 'networks={{range $n,$v := .NetworkSettings.Networks}}{{printf "%s=%s " $n $v.IPAddress}}{{end}}' amnezia-awg2 +docker inspect -f 'networks={{range $n,$v := .NetworkSettings.Networks}}{{printf "%s=%s " $n $v.IPAddress}}{{end}}' "$AWG" ``` Ожидаемый результат по портам: @@ -189,10 +192,12 @@ Optional deep-check DNS path (если нужна углублённая про ```bash apt install -y dnsutils +AWG="$(docker ps --format '{{.Names}}' | grep -E '^(amnezia-awg2|amnezia-awg)$' | head -n1)" DNS_IP="$(docker inspect -f '{{range $n,$v := .NetworkSettings.Networks}}{{if $v.IPAddress}}{{println $v.IPAddress}}{{end}}{{end}}' amnezia-dns | head -n1)" DNS_PID="$(docker inspect -f '{{.State.Pid}}' amnezia-dns)" -AWG_PID="$(docker inspect -f '{{.State.Pid}}' amnezia-awg2)" +AWG_PID="$(docker inspect -f '{{.State.Pid}}' "$AWG")" +echo "AWG=$AWG" echo "DNS_IP=$DNS_IP" nsenter -t "$DNS_PID" -n ss -lntup nsenter -t "$AWG_PID" -n ip route