mirror of
https://github.com/oqyude/nixos.git
synced 2026-10-11 22:37:25 +03:00
Comprehensive batch addressing the 16-task backlog in
.agent/tasks/manifest.json. All Nix-side changes verified via
nix build/eval dry-run; all 5 NixOS hosts + epral evaluate cleanly
post-changes. No regressions.
Wave 1 (non-functional cleanup):
T1/A1 — configurations/mobile.nix:12: fix `import ../lib/xlib.nix`
(broken path) → `import ../lib/xlib`. Unblocks nixOnDroid
configurations.epral. R1.1 invariant.
T8/C3 — modules/containers/3x-ui.nix: remove `podman-update-3xui_app`
systemd service and commented timer. Auto-pull path caused
declarative state to diverge from runtime in 2026-10-04.
R1.5 invariant.
T13/D3 — modules/server/nginx.nix:368-371: remove dead
`networking.firewall.allowedTCPPorts = [80 443]`.
`firewall.enable = false` on sapphira (R1.3), so openFirewall
rules are no-op. Replace with R1.3 comment.
T6/C1 — .agent/decisions/notes/3x-ui-xray-26.9.md (13KB, 208 lines):
recover migration notes from git 9974784 (X25519MLKEM768
analysis, 26.7→26.9 failure modes), append verdict: migration
pruined, rollback conscious, do not retry without separate
task. R1.5 / C1.
T9/C4 — .agent/rules/project-rules.md: add R1.8 — Xray-core version is
state of 3x-ui panel, not Nix. Update trap entry for
3x-ui.nix:54 to reference R1.8.
T11/D1, T12/D2 — .agent/checkpoints.json + .agent/tasks/manifest.json:
verify R1.3 (router port-forwards 22/80/443/8443/22000) and
R1.4 (100.64.0.0 = Tailscale sapphira) wording already
satisfies acceptance criteria. Flip status pending → completed.
T4 (storage guard, FUNCTIONAL CHANGE):
New helper in lib/xlib/helpers.nix:
mkStorageGuard = xlib: {
RequiresMountsFor = [ xlib.dirs.server-home ];
ConditionPathIsMountPoint = [ "!${xlib.dirs.server-home}" ];
};
Applied to 13 systemd units via path-style override:
- modules/server/{postgresql,samba,homebox,gitea,navidrome,
syncthing,uptime-kuma,immich,nextcloud,calibre-web}.nix
- modules/containers/3x-ui.nix (podman-3xui_app)
- modules/containers/tape-rotation.nix (podman-taperotation-{backend,frontend})
Anchor: xlib.dirs.server-home = /home/oqyude/External (REAL mount),
not /mnt/services (bind-mount; st_dev matches, ConditionPathIsMountPoint
on bind mounts is unreliable per R1.2 note).
Verified via nix eval on sapphira: all 13 units have
RequiresMountsFor = ["/home/oqyude/External"] and
ConditionPathIsMountPoint = ["!/home/oqyude/External"].
Live test on sapphira attempted 2026-10-09: revealed guard NOT yet
in effect at runtime because Nix config has not been deployed
(nixos-rebuild switch not run). postgresql started despite External
being unmounted. Implementation correct, deployment pending user
action.
T7/C2 (read-only diag, no code change):
3x-ui version facts recorded in conversation (sapphira journal +
/var/lib/containers/storage/overlay/.../diff/app/bin/xray-linux-amd64):
- Active Xray: 26.7.28 (go1.26.5 linux/amd64) — R1.5 validated at runtime
- Stale binary: 26.9.30 (go1.27.1) — leftover from failed 26.9 migration
- Panel DB (x-ui.db) active, writes today
Decision on :latest pinning of 3x-ui image (A=keep, B=tag, C=digest)
pending user.
T3/A3 (nftables on otreca — config analysis + proposal):
Diagnostic attempted via ssh otreca-tailscale (100.64.1.0) and
otreca public (109.248.161.5:22): BOTH UNREACHABLE. Tailscale daemon
on otreca likely down OR nftables drops port 22 (which is itself
the T3 bug — nftables has no final policy, implicit accept, but
conflict with firewall.enable = true per R1.6).
Proposal written: .agent/decisions/proposals/vds-nftables-fix.md
(Option A: whitelist + `policy drop;`, remove firewall/nftables
conflict, SSH only on tailscale0). Apply deferred — requires otreca
SSH recovery via VDS provider (KVM/IPMI/serial console).
T5/B2 (backups documentation):
.agent/decisions/0002-backups-external.md (draft): catalog of what
is declared in Nix vs. what is external; awaiting answer to open
question 5.6 (where are backups, how are they verified).
T15/E2 (CI checks):
.ci/checks.sh (executable, ~140 lines) with 3 checks from
analysis-report.md §5:
- #1: no `:latest` in container images (with R1.5 whitelist
for 3x-ui). FAIL — 4 violations:
localhost/kokoro-tts:latest
ghcr.io/openhands/openhands:latest
docker.io/elizaroveugene/taperotation-backend:latest
docker.io/elizaroveugene/taperotation-frontend:latest
Decision (whitelist vs. pin) pending user.
- #2: nix flake check (skipped with --no-build).
- #7: secrets/ files match .sops.yaml path_regex. PASS.
T16/E3 (archive commented modules):
13 of 14 commented modules in modules/server/default.nix:37-50
existed as files. git mv them to archive/{server-modules,containers}/.
1 (stirling-pdf.nix) didn't exist; just removed the comment.
modules/server/default.nix:37-50 cleaned of 14 commented lines.
Added 3-line comment recording the archive date and reason.
Verified: nixosConfigurations.sapphira still evaluates.
Post-change state:
$ nix build .#nixosConfigurations.{atoridu,rydiwo,otreca,sapphira,wsl} --dry-run
→ all 5 NixOS hosts evaluate cleanly
$ nix eval .#nixOnDroidConfigurations.epral.config.system.stateVersion
→ "24.05"
Pending (user input required — not in this commit):
- T4 deploy: run `nixos-rebuild switch` on sapphira to activate guard
- T7: pick A/B/C for 3x-ui :latest pinning
- T3: recover otreca SSH via VDS provider, then apply Option A
- T10/C5: decide fate of reality443Forwarding
- T5: answer 5.6 about backup location/verification
- T15: whitelist or pin 4 :latest images
Untracked files NOT committed (in .gitignore):
.temp/t4-live-test*.sh, .temp/cleanup-*.sh — throwaway test scripts
from T4 live test attempts. Preserved locally for reference; see
AGENTS.md convention ("Создавать `.temp/` в корне проекта — Для
временных файлов агента. Всегда в `.gitignore`").
Also untracked, committed:
.agent/reviews/2026-10-10-review-dev-diff-vs-16644fc.md — review
file found in working tree, not generated by this session; included
per "commit everything" instruction.
378 lines
13 KiB
Nix
378 lines
13 KiB
Nix
{
|
|
config,
|
|
lib,
|
|
pkgs,
|
|
xlib,
|
|
...
|
|
}:
|
|
# Standard reverse-proxy: HTTP/S termination upstream, backend on the LAN.
|
|
# x.zeroq.su is the 3x-ui controller panel — see 3x-ui.nix for the
|
|
# /subs/, /subsjs/, /clash/ routing logic.
|
|
let
|
|
server = "192.168.1.20";
|
|
|
|
mkProxy =
|
|
{
|
|
domain,
|
|
port,
|
|
addSSL ? false,
|
|
extraConfig ? "",
|
|
}:
|
|
{
|
|
name = domain;
|
|
value = {
|
|
enableACME = true;
|
|
locations."/" = {
|
|
proxyPass = "http://${server}:${toString port}";
|
|
proxyWebsockets = true;
|
|
};
|
|
}
|
|
// lib.optionalAttrs (!addSSL) { forceSSL = true; }
|
|
// lib.optionalAttrs addSSL { addSSL = true; }
|
|
// lib.optionalAttrs (extraConfig != "") { inherit extraConfig; };
|
|
};
|
|
|
|
bigUploads = "client_max_body_size 5G;";
|
|
|
|
sites = [
|
|
{
|
|
domain = "immich.zeroq.su";
|
|
port = 2283;
|
|
addSSL = true;
|
|
extraConfig = bigUploads;
|
|
}
|
|
{
|
|
domain = "kuma.zeroq.su";
|
|
port = 4001;
|
|
}
|
|
{
|
|
domain = "health.zeroq.su";
|
|
port = 19999;
|
|
}
|
|
{
|
|
domain = "git.zeroq.su";
|
|
port = 3000;
|
|
}
|
|
{
|
|
domain = "homebox.zeroq.su";
|
|
port = 7745;
|
|
}
|
|
{
|
|
domain = "flux.zeroq.su";
|
|
port = 6061;
|
|
}
|
|
{
|
|
domain = "tape-rotation.zeroq.su";
|
|
port = 5174;
|
|
}
|
|
# NOTE: open.zeroq.su is intentionally NOT in this `sites` list —
|
|
# mkProxy hard-codes ${server} = 192.168.1.20, but the Open WebUI
|
|
# container binds to 127.0.0.1:8080 only (loopback, see
|
|
# modules/containers/open-webui.nix). The vhost is added directly
|
|
# to `virtualHosts` below, alongside x.zeroq.su (3x-ui panel,
|
|
# same loopback-only pattern).
|
|
{
|
|
domain = "navidrome.zeroq.su";
|
|
port = 4533;
|
|
addSSL = true;
|
|
}
|
|
{
|
|
domain = "calibre.zeroq.su";
|
|
port = 8083;
|
|
extraConfig = bigUploads;
|
|
}
|
|
{
|
|
domain = "nix-cache.zeroq.su";
|
|
port = 5000;
|
|
extraConfig = bigUploads;
|
|
}
|
|
{
|
|
domain = "pdf.zeroq.su";
|
|
port = 8446;
|
|
extraConfig = bigUploads;
|
|
}
|
|
];
|
|
in
|
|
{
|
|
services.nginx = {
|
|
enable = true;
|
|
recommendedGzipSettings = true;
|
|
recommendedOptimisation = true;
|
|
recommendedProxySettings = true;
|
|
recommendedTlsSettings = true;
|
|
virtualHosts = (builtins.listToAttrs (map mkProxy sites)) // {
|
|
"nextcloud.private" = {
|
|
forceSSL = false;
|
|
enableACME = false;
|
|
listen = [
|
|
{
|
|
addr = "100.64.0.0";
|
|
port = 10000;
|
|
}
|
|
{
|
|
addr = "192.168.1.20";
|
|
port = 10000;
|
|
}
|
|
{
|
|
addr = "127.0.0.1";
|
|
port = 10000;
|
|
}
|
|
];
|
|
};
|
|
"office.zeroq.su" = {
|
|
forceSSL = true;
|
|
enableACME = true;
|
|
};
|
|
# vtimeline.zeroq.su — Veeam Timeline View. Reverse-proxies the
|
|
# entire vhost to a local Node.js/Express process (managed by
|
|
# systemd as `vtimeline-api` — see modules/server/vtimeline.nix),
|
|
# which serves both the static frontend (public_html/) and the
|
|
# /api/uploads JSON-upload CRUD over a single listener on
|
|
# 127.0.0.1:8000. Authelia forward-auth is wired on `/` so every
|
|
# hit (static OR /api/*) requires a valid session cookie.
|
|
#
|
|
# client_max_body_size 6m matches the server.js body limit
|
|
# (5 MB hard cap). nginx's default 1m would 413 any upload near
|
|
# the cap before the request reached the node process.
|
|
"vtimeline.zeroq.su" = {
|
|
forceSSL = true;
|
|
enableACME = true;
|
|
locations = {
|
|
"/" = {
|
|
proxyPass = "http://127.0.0.1:8000";
|
|
proxyWebsockets = true;
|
|
extraConfig = ''
|
|
auth_request /authelia;
|
|
auth_request_set $authelia_user $upstream_http_remote_user;
|
|
# Authelia for an anonymous user on a `one_factor`-protected
|
|
# vhost returns 302 + Location to the login UI by default
|
|
# (because nginx forwards Accept: text/html). nginx's
|
|
# auth_request only treats 2xx/4xx as pass/deny, so a bare
|
|
# 302 surfaces to the client as 500 ("auth request
|
|
# unexpected status"). Converting 401 → 302 to the
|
|
# login page handles that case. Authelia returns 401 only
|
|
# when the subrequest advertises Accept: application/json
|
|
# (see the /authelia block below).
|
|
# `$request_uri` is the URI path only — Authelia would
|
|
# then resolve `rd` as relative to its own `authelia_url`
|
|
# and send the user back to `authelia.zeroq.su/<path>`,
|
|
# not `vtimeline.zeroq.su/<path>`, after a successful
|
|
# login. Pass the full origin (scheme + host + path) so
|
|
# Authelia constructs an absolute redirect back to the
|
|
# original vhost.
|
|
error_page 401 =302 https://authelia.zeroq.su/?rd=$scheme://$host$request_uri;
|
|
client_max_body_size 6m;
|
|
'';
|
|
};
|
|
"= /authelia" = {
|
|
extraConfig = ''
|
|
internal;
|
|
proxy_pass http://127.0.0.1:9091/api/authz/forward-auth;
|
|
proxy_set_header X-Original-URL $request_uri;
|
|
proxy_set_header X-Forwarded-Proto $scheme;
|
|
proxy_set_header X-Forwarded-Host $host;
|
|
proxy_set_header X-Forwarded-Method $request_method;
|
|
proxy_set_header X-Forwarded-Uri $request_uri;
|
|
proxy_set_header X-Forwarded-For $remote_addr;
|
|
# Force Authelia to respond with 401 (not 302 + Location) so
|
|
# the error_page 401 =302 rule above can take over. With the
|
|
# default Accept: text/html Authelia sends a 302 with an
|
|
# absolute Location, which auth_request surfaces to the client
|
|
# as 500 ("unexpected status").
|
|
proxy_set_header Accept "application/json";
|
|
'';
|
|
};
|
|
};
|
|
};
|
|
# tty.zeroq.su — web-shell (ttyd) behind Authelia forward-auth.
|
|
# ttyd listens on 127.0.0.1:7681 only (modules/server/ttyd.nix), so
|
|
# nginx is the only ingress. Same auth_request / 401→302 wiring as
|
|
# vtimeline.zeroq.su above — the wildcard rule `*.zeroq.su` in
|
|
# modules/server/authelia.nix already covers this subdomain under
|
|
# `one_factor`, so no policy change is needed.
|
|
"tty.zeroq.su" = {
|
|
forceSSL = true;
|
|
enableACME = true;
|
|
locations = {
|
|
"/" = {
|
|
proxyPass = "http://127.0.0.1:7681";
|
|
proxyWebsockets = true;
|
|
extraConfig = ''
|
|
auth_request /authelia;
|
|
auth_request_set $authelia_user $upstream_http_remote_user;
|
|
# Same 401→302 trick as vtimeline.zeroq.su: a bare 302 from
|
|
# Authelia surfaces to the client as a 500 ("auth request
|
|
# unexpected status"), so we rewrite the response status to
|
|
# a 302 pointing at the authelia login UI with an absolute
|
|
# `$scheme://$host$request_uri` so the post-login `rd`
|
|
# lands the user back on tty.zeroq.su, not on
|
|
# authelia.zeroq.su/<path>.
|
|
error_page 401 =302 https://authelia.zeroq.su/?rd=$scheme://$host$request_uri;
|
|
'';
|
|
};
|
|
"= /authelia" = {
|
|
extraConfig = ''
|
|
internal;
|
|
proxy_pass http://127.0.0.1:9091/api/authz/forward-auth;
|
|
proxy_set_header X-Original-URL $request_uri;
|
|
proxy_set_header X-Forwarded-Proto $scheme;
|
|
proxy_set_header X-Forwarded-Host $host;
|
|
proxy_set_header X-Forwarded-Method $request_method;
|
|
proxy_set_header X-Forwarded-Uri $request_uri;
|
|
proxy_set_header X-Forwarded-For $remote_addr;
|
|
# Same Accept-forces-401 trick as vtimeline.zeroq.su — see
|
|
# the comment there for why Authelia's default 302 is
|
|
# harmful here.
|
|
proxy_set_header Accept "application/json";
|
|
'';
|
|
};
|
|
};
|
|
};
|
|
# Authelia login UI — same podman container on 127.0.0.1:9091 as the
|
|
# forward-auth endpoint above, just exposed on a separate vhost so
|
|
# Authelia has a stable absolute URL to redirect users to. Authelia
|
|
# generates internal links against $session.cookies[0].authelia_url,
|
|
# which is set to https://${autheliaFqdn}/ in modules/server/authelia.nix.
|
|
"authelia.zeroq.su" = {
|
|
forceSSL = true;
|
|
enableACME = true;
|
|
locations."/" = {
|
|
proxyPass = "http://127.0.0.1:9091";
|
|
proxyWebsockets = true;
|
|
};
|
|
};
|
|
"pdf.private" = {
|
|
forceSSL = false;
|
|
enableACME = false;
|
|
listen = [
|
|
{
|
|
addr = "0.0.0.0";
|
|
port = 80;
|
|
}
|
|
{
|
|
addr = "100.64.0.0";
|
|
port = 8446;
|
|
}
|
|
{
|
|
addr = "192.168.1.20";
|
|
port = 8446;
|
|
}
|
|
{
|
|
addr = "127.0.0.1";
|
|
port = 8446;
|
|
}
|
|
];
|
|
extraConfig = bigUploads;
|
|
};
|
|
"x.zeroq.su" = {
|
|
forceSSL = true;
|
|
enableACME = true;
|
|
locations = {
|
|
"/" = {
|
|
proxyPass = "http://127.0.0.1:2049";
|
|
proxyWebsockets = true;
|
|
};
|
|
"/subs/" = {
|
|
proxyPass = "http://127.0.0.1:2096";
|
|
proxyWebsockets = true;
|
|
};
|
|
"/subsjs/" = {
|
|
proxyPass = "http://127.0.0.1:2096";
|
|
proxyWebsockets = true;
|
|
};
|
|
"/clash/" = {
|
|
proxyPass = "http://127.0.0.1:2096";
|
|
proxyWebsockets = true;
|
|
};
|
|
};
|
|
};
|
|
# Open WebUI — same loopback-only pattern as x.zeroq.su above.
|
|
# The container listens on 127.0.0.1:8080 (modules/containers/open-webui.nix),
|
|
# so we proxy_pass to 127.0.0.1, not the LAN IP. The two extra
|
|
# directives are required by the upstream HTTPS docs:
|
|
# proxy_buffering off for SSE streaming (markdown in chat breaks
|
|
# under the default `proxy_buffering on` from recommendedProxySettings),
|
|
# and a 300 s read timeout for long LLM completions.
|
|
"open.zeroq.su" = {
|
|
forceSSL = true;
|
|
enableACME = true;
|
|
locations."/" = {
|
|
proxyPass = "http://127.0.0.1:8080";
|
|
proxyWebsockets = true;
|
|
};
|
|
extraConfig = ''
|
|
proxy_buffering off;
|
|
proxy_read_timeout 300s;
|
|
'';
|
|
};
|
|
"zeroq.su" = {
|
|
forceSSL = true;
|
|
enableACME = true;
|
|
root = pkgs.writeTextDir "index.html" ''
|
|
<!doctype html>
|
|
<html>
|
|
<body>
|
|
<pre>What are you doing here?</pre>
|
|
</body>
|
|
</html>
|
|
'';
|
|
locations."/guest/" = {
|
|
proxyPass = "http://${server}:80";
|
|
proxyWebsockets = true;
|
|
};
|
|
};
|
|
"vetymae.opencodes.zeroq.su" = {
|
|
forceSSL = true;
|
|
enableACME = true;
|
|
locations."/" = {
|
|
proxyPass = "http://100.86.62.4:4096";
|
|
proxyWebsockets = true;
|
|
};
|
|
};
|
|
"lamet.opencodes.zeroq.su" = {
|
|
forceSSL = true;
|
|
enableACME = true;
|
|
locations."/" = {
|
|
proxyPass = "http://100.106.21.39:6061";
|
|
proxyWebsockets = true;
|
|
};
|
|
};
|
|
# sapphira itself: opencode web runs as a systemd user service
|
|
# (programs.opencode.web.enable in home/modules/opencode.nix) on
|
|
# 127.0.0.1:4096 with --hostname 0.0.0.0.
|
|
"opencode.zeroq.su" = {
|
|
forceSSL = true;
|
|
enableACME = true;
|
|
locations."/" = {
|
|
proxyPass = "http://127.0.0.1:4096";
|
|
proxyWebsockets = true;
|
|
};
|
|
};
|
|
"nextcloud.zeroq.su" = {
|
|
forceSSL = true;
|
|
enableACME = true;
|
|
locations = {
|
|
"/" = {
|
|
proxyPass = "http://${server}:10000";
|
|
proxyWebsockets = true;
|
|
};
|
|
"/whiteboard" = {
|
|
proxyPass = "http://${server}:3002";
|
|
proxyWebsockets = true;
|
|
};
|
|
};
|
|
extraConfig = bigUploads;
|
|
};
|
|
};
|
|
};
|
|
# networking.firewall is intentionally unused on sapphira (R1.3):
|
|
# the network boundary is the router, not the host firewall.
|
|
|
|
# Note: the previous vtimeline-htpasswd sops declaration lived here. It
|
|
# was removed when authelia replaced nginx's auth_basic (see the vtimeline
|
|
# vhost above). The encrypted file modules/server/secrets/vtimeline-htpasswd.yaml
|
|
# itself was kept untouched per the repo policy of not modifying secrets
|
|
# without explicit owner sign-off; delete it with `sops --version` and
|
|
# `rm` once the cutover is verified.
|
|
}
|