From 65ba02027d2a9a755c976a4199e6bfa4bc98bc53 Mon Sep 17 00:00:00 2001 From: Alexey Martemyanov Date: Fri, 29 May 2026 08:50:04 +0600 Subject: [PATCH 1/3] [2026-05-29] fix: resolved merge conflict in wiki/htpc-bazzite-proton.md --- wiki/htpc-bazzite-proton.md | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/wiki/htpc-bazzite-proton.md b/wiki/htpc-bazzite-proton.md index be8d848f..bcf52c7d 100644 --- a/wiki/htpc-bazzite-proton.md +++ b/wiki/htpc-bazzite-proton.md @@ -33,13 +33,8 @@ on Proton 8.0. - **Rayman Origins** (fixed 2026-05-23 — GE-Proton10-34 + `WINEDLLOVERRIDES=\"d3d9=b\" %command%`) - Samurai Gunn (works but **gamepad not detected**) - GTA V, Cuphead (assumed; not retested) -<<<<<<< HEAD -- **VK GameCenter** (GE-Proton10-34, shared prefix c Lutris, авторизация через Lutris + `vk-login-helper`) -- **Atomic Heart VK** (через VK GameCenter, 97GB, `Data/gamecenter/atomic heart/`, URL-схема `vkplay://play/0.2015959`) -======= -- **VK GameCenter** (GE-Proton10-34, `Data/gamecenter/GameCenter/`) -- **Atomic Heart VK** (через VK GameCenter, 97GB, `Data/gamecenter/atomic heart/`) ->>>>>>> nas/main +|- **VK GameCenter** (GE-Proton10-34, shared prefix c Lutris, авторизация через Lutris + `vk-login-helper`) +|- **Atomic Heart VK** (через VK GameCenter, 97GB, `Data/gamecenter/atomic heart/`, URL-схема `vkplay://play/0.2015959`) - **Doom 3 BFG** (через flatpak Classic-RBDOOM-3-BFG) ## Removed from Steam shortcuts ✅ From eab66504db1fa519a2770a92912a55d3452fb219 Mon Sep 17 00:00:00 2001 From: Alexey Martemyanov Date: Fri, 29 May 2026 08:57:56 +0600 Subject: [PATCH 2/3] =?UTF-8?q?[2026-05-29]=20docs:=20=D0=B4=D0=BE=D0=B1?= =?UTF-8?q?=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=BF=D1=80=D0=B5=D0=B4=D1=83=D0=BF?= =?UTF-8?q?=D1=80=D0=B5=D0=B6=D0=B4=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=20=D1=80=D0=B0=D0=B7=D0=BD=D1=8B=D0=B5=20=D1=81=D0=B5?= =?UTF-8?q?=D1=82=D0=B8=20(192.168.1.x=20vs=20192.168.2.x)=20=D0=B2=20true?= =?UTF-8?q?nas-access,=20truenas-infrastructure,=20truenas-remote-access?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- family/how-to/truenas-access.md | 6 +++++- family/how-to/truenas-infrastructure.md | 6 +++--- personal/docs/truenas-remote-access-reverse-proxy.md | 6 ++++++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/family/how-to/truenas-access.md b/family/how-to/truenas-access.md index 94fa5164..22248abb 100644 --- a/family/how-to/truenas-access.md +++ b/family/how-to/truenas-access.md @@ -10,6 +10,10 @@ | SSH | truenas_admin@mallexxx.duckdns.org | | SSH (IP) | truenas_admin@90.189.160.148 | | SSH-ключ | ~/.ssh/id_rsa | +| Сеть | 192.168.2.0/24 (через OpenWrt) | + +> ⚠️ **Eagle и Kraken — в 192.168.1.x, это другая сеть.** Прямой доступ по 192.168.2.197 с них не работает. +> Для SSH/API с Eagle и Kraken используйте **только** `mallexxx.duckdns.org`. ## Подключение @@ -41,4 +45,4 @@ ssh -i ~/.ssh/id_rsa truenas_admin@mallexxx.duckdns.org Типичные жертвы: - SSH authorized_keys в /home - Cron jobs, написанные в /etc -- Любые файлы вне /mnt/RED_2TB/ +- Любые файлы вне /mnt/RED_2TB/ \ No newline at end of file diff --git a/family/how-to/truenas-infrastructure.md b/family/how-to/truenas-infrastructure.md index b491f950..742ef8da 100644 --- a/family/how-to/truenas-infrastructure.md +++ b/family/how-to/truenas-infrastructure.md @@ -1,13 +1,13 @@ # TrueNAS — инфраструктура -> Обновлено: 2026-04-30 +> Обновлено: 2026-05-29 ## Доступ - **Host (local):** `192.168.2.197` — локальный IP TrueNAS в подсети роутера (192.168.2.x) - ⚠️ Eagle (Mac, 192.168.1.x) и Kraken (192.168.1.14) находятся в **другой подсети** → прямой доступ по 192.168.2.197 с них **недоступен** - - Для SSH/API с Орла и Кракена — только через `mallexxx.duckdns.org` -- **Host (external):** `mallexxx.duckdns.org` (DuckDNS) — основной способ доступа извне и из 192.168.1.x + - ⚠️ Кра́кен и TrueNAS — **разные сети** (192.168.1.x vs 192.168.2.x). Доступ с Кракена на TrueNAS по локальному IP **не работает** +- **Host (external):** `mallexxx.duckdns.org` (DuckDNS) — **единственный способ** SSH/API из 192.168.1.x - **SSH:** `truenas_admin@mallexxx.duckdns.org -i ~/.ssh/id_rsa` - **Web UI:** http://truenas.mallexxx.duckdns.org - **Portainer:** https://portainer.mallexxx.duckdns.org diff --git a/personal/docs/truenas-remote-access-reverse-proxy.md b/personal/docs/truenas-remote-access-reverse-proxy.md index a23d84b0..0e509eef 100644 --- a/personal/docs/truenas-remote-access-reverse-proxy.md +++ b/personal/docs/truenas-remote-access-reverse-proxy.md @@ -1,3 +1,9 @@ +> ⚠️ **Важно: разные сети** +> TrueNAS (192.168.2.197) находится в подсети **192.168.2.0/24** (через OpenWrt). +> Eagle (Mac) и Kraken — в **192.168.1.0/24**. Прямой доступ по IP с них **невозможен**. +> **Всегда используйте** `truenas_admin@mallexxx.duckdns.org` для SSH из 192.168.1.x. +> Для Eagle/Kraken/Taiga — только `mallexxx.duckdns.org`. + # TrueNAS Remote Access Cheat Sheet ## Network Layout From 54c78767765208f7e1e53742f225a35fd7b6b191 Mon Sep 17 00:00:00 2001 From: Alexey Martemyanov Date: Fri, 29 May 2026 11:02:34 +0600 Subject: [PATCH 3/3] =?UTF-8?q?[2026-05-29]=20inbox:=20=D0=B4=D0=BE=D0=B1?= =?UTF-8?q?=D0=B0=D0=B2=D0=B8=D0=BB=20triage-=D0=B1=D1=80=D0=B8=D1=84=20?= =?UTF-8?q?=D0=B7=D0=B0=202026-05-29=20(=D1=82=D0=B8=D1=88=D0=B8=D0=BD?= =?UTF-8?q?=D0=B0=20=D0=B2=20inbox)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- work/briefs/inbox/2026-05-29.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 work/briefs/inbox/2026-05-29.md diff --git a/work/briefs/inbox/2026-05-29.md b/work/briefs/inbox/2026-05-29.md new file mode 100644 index 00000000..f551b48f --- /dev/null +++ b/work/briefs/inbox/2026-05-29.md @@ -0,0 +1,19 @@ +## Inbox Triage — 2026-05-29 (since 2026-05-29T10:01:29) + +### New / Changed — Action Required +_None._ + +### New / Changed — Monitoring +_None._ + +### Nothing new +Inbox quiet — nothing new. + +Activity in the SINCE window (2026-05-29T10:01:29 Almaty → latest sync at 10:31:55 Almaty / 04:31:55 UTC): +- 1 self-reaction by Alex on _DRI <> Project Advisor async_ (excluded — self). +- 1 new CI task by Sam S on iOS/macOS Release Boards (_[CI] Avoid running automations when Cursor edits the PR description_) — not assigned to Alex, no @mention (excluded — scope). +- 2 Domain-rank custom-field changes by Dax bot on macOS Feedback items (excluded — bot noise). +- No @mentions of Alex (direct DB check, STEP 1b). +- No new comments on Alex's open tasks. +- No Ship Review / Tech Design state changes. +- No new assignments to Alex.