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.
195 lines
7.4 KiB
Nix
195 lines
7.4 KiB
Nix
{
|
|
config,
|
|
lib,
|
|
pkgs,
|
|
xlib,
|
|
...
|
|
}:
|
|
# TapeRotation — web app for tracking and rotation of backup tape
|
|
# cartridges. https://github.com/ElizarovEugene/TapeRotation
|
|
#
|
|
# Podman adaptation of the upstream docker-compose deployment. Two
|
|
# containers on a shared "taperotation_default" network (mirrors the
|
|
# compose project network):
|
|
# - taperotation-backend: FastAPI/uvicorn on :8001, SQLite at /data,
|
|
# file attachments at /app/uploads
|
|
# - taperotation-frontend: nginx serving the built React app on :80,
|
|
# proxying /api to http://backend:8001
|
|
# The backend container gets a static IP on the shared network and the
|
|
# frontend maps "backend" → that IP via --add-host, because this host's
|
|
# CoreDNS service owns port 53 on every interface: the podman network DNS
|
|
# plugin (aardvark-dns) cannot bind on the network gateway, so a network
|
|
# with dns_enabled would refuse to attach containers.
|
|
#
|
|
# Published host port 5174 → container:80 for the web UI. Keep it out
|
|
# of networking.firewall like the other panel ports and front it with an
|
|
# nginx vhost, e.g. in server/nginx.nix:
|
|
# { domain = "tape-rotation.zeroq.su"; port = 5174; }
|
|
# and set APP_URL / CORS_ORIGINS in the sops-encrypted env file.
|
|
#
|
|
# Instance config lives in one sops-encrypted .env file (mirrors the
|
|
# upstream .env.example, sops-nix format = "dotenv", key = "" → whole
|
|
# file): sops modules/containers/secrets/tape-rotation.env
|
|
# On first boot the admin account is created from ADMIN_USERNAME /
|
|
# ADMIN_PASSWORD from that file.
|
|
let
|
|
panel = "${xlib.dirs.services-nodes-folder}/${xlib.device.hostname}/tape-rotation";
|
|
in
|
|
{
|
|
virtualisation = {
|
|
podman = {
|
|
enable = true;
|
|
autoPrune = {
|
|
enable = true;
|
|
flags = [ "--all" ];
|
|
};
|
|
dockerCompat = true;
|
|
};
|
|
oci-containers = {
|
|
backend = "podman";
|
|
containers = {
|
|
"taperotation-backend" = {
|
|
image = "docker.io/elizaroveugene/taperotation-backend:latest";
|
|
environment = {
|
|
"DATABASE_URL" = "sqlite:////data/taperotation.db";
|
|
"JWT_EXPIRE_MINUTES" = "480";
|
|
"ADMIN_USERNAME" = "admin";
|
|
"ADMIN_LANGUAGE" = "en";
|
|
"NOTIFY_DAYS_BEFORE" = "7";
|
|
"TZ" = "Europe/Moscow";
|
|
};
|
|
# Path resolved from the sops block at the bottom of this file —
|
|
# see invariant S1 in docs/arch/invariants.md.
|
|
environmentFiles = [ config.sops.secrets."tape-rotation-env".path ];
|
|
volumes = [
|
|
"${panel}/db:/data:rw"
|
|
"${panel}/uploads:/app/uploads:rw"
|
|
];
|
|
log-driver = "journald";
|
|
extraOptions = [
|
|
"--network=taperotation_default"
|
|
# Static IP the frontend reaches "backend" at (see --add-host
|
|
# in the frontend container; network DNS is disabled).
|
|
"--ip=10.89.0.10"
|
|
];
|
|
};
|
|
"taperotation-frontend" = {
|
|
image = "docker.io/elizaroveugene/taperotation-frontend:latest";
|
|
ports = [
|
|
"0.0.0.0:5174:80/tcp"
|
|
];
|
|
log-driver = "journald";
|
|
extraOptions = [
|
|
"--network=taperotation_default"
|
|
# Baked-in nginx upstream is http://backend:8001; resolve it via
|
|
# /etc/hosts since the network has no DNS plugin.
|
|
"--add-host=backend:10.89.0.10"
|
|
];
|
|
};
|
|
};
|
|
};
|
|
};
|
|
|
|
# Enable container name DNS for all Podman networks.
|
|
networking.firewall.interfaces =
|
|
let
|
|
matchAll = if !config.networking.nftables.enable then "podman+" else "podman*";
|
|
in
|
|
{
|
|
"${matchAll}".allowedUDPPorts = [ 53 ];
|
|
};
|
|
|
|
systemd = {
|
|
services = {
|
|
"podman-taperotation-backend" = {
|
|
serviceConfig = xlib.helpers.mkStorageGuard xlib // {
|
|
Restart = lib.mkOverride 90 "always";
|
|
};
|
|
after = [ "podman-network-taperotation_default.service" ];
|
|
requires = [ "podman-network-taperotation_default.service" ];
|
|
partOf = [ "podman-compose-tape-rotation-root.target" ];
|
|
wantedBy = [ "podman-compose-tape-rotation-root.target" ];
|
|
};
|
|
"podman-taperotation-frontend" = {
|
|
serviceConfig = xlib.helpers.mkStorageGuard xlib // {
|
|
Restart = lib.mkOverride 90 "always";
|
|
};
|
|
after = [
|
|
"podman-network-taperotation_default.service"
|
|
"podman-taperotation-backend.service"
|
|
];
|
|
requires = [ "podman-network-taperotation_default.service" ];
|
|
partOf = [ "podman-compose-tape-rotation-root.target" ];
|
|
wantedBy = [ "podman-compose-tape-rotation-root.target" ];
|
|
};
|
|
"podman-network-taperotation_default" = {
|
|
path = [ pkgs.podman ];
|
|
serviceConfig = {
|
|
Type = "oneshot";
|
|
RemainAfterExit = true;
|
|
ExecStop = "podman network rm -f taperotation_default";
|
|
};
|
|
script = ''
|
|
# Always (re)create the stack network: the host's CoreDNS owns :53
|
|
# on every interface, so the network DNS plugin (aardvark-dns)
|
|
# can't bind on the gateway → --disable-dns. --subnet backs the
|
|
# backend's static IP. Recreate-on-start also self-heals after a
|
|
# `podman system prune` removed the (temporarily unused) network.
|
|
podman network rm -f taperotation_default >/dev/null 2>&1 || true
|
|
podman network create --disable-dns --subnet=10.89.0.0/24 taperotation_default
|
|
'';
|
|
partOf = [ "podman-compose-tape-rotation-root.target" ];
|
|
wantedBy = [ "podman-compose-tape-rotation-root.target" ];
|
|
};
|
|
"podman-update-taperotation" = {
|
|
path = [ pkgs.podman ];
|
|
serviceConfig = {
|
|
Type = "oneshot";
|
|
TimeoutSec = 300;
|
|
};
|
|
script = ''
|
|
podman pull docker.io/elizaroveugene/taperotation-backend:latest
|
|
podman pull docker.io/elizaroveugene/taperotation-frontend:latest
|
|
systemctl restart podman-taperotation-backend.service podman-taperotation-frontend.service
|
|
'';
|
|
};
|
|
};
|
|
# Starts/stops together with all TapeRotation containers.
|
|
targets."podman-compose-tape-rotation-root" = {
|
|
unitConfig.Description = "Root target generated by compose2nix.";
|
|
wantedBy = [ "multi-user.target" ];
|
|
};
|
|
# Enable automatic image updates:
|
|
# systemd.timers."podman-update-taperotation" = {
|
|
# wantedBy = [ "timers.target" ];
|
|
# timerConfig = {
|
|
# OnCalendar = "weekly";
|
|
# Persistent = true;
|
|
# };
|
|
# };
|
|
tmpfiles.rules = [
|
|
(xlib.helpers.mkTmpfile "d" xlib.dirs.services-mnt-folder "0755" "root" "root")
|
|
(xlib.helpers.mkTmpfile "d" xlib.dirs.services-nodes-folder "0755" "root" "root")
|
|
(xlib.helpers.mkTmpfile "d" "${xlib.dirs.services-nodes-folder}/${xlib.device.hostname}" "0755"
|
|
"root"
|
|
"root"
|
|
)
|
|
(xlib.helpers.mkTmpfile "d" panel "0755" "root" "root")
|
|
(xlib.helpers.mkTmpfile "d" "${panel}/db" "0755" "root" "root")
|
|
(xlib.helpers.mkTmpfile "d" "${panel}/uploads" "0755" "root" "root")
|
|
# Relabel panel dir for SELinux so containers can access it.
|
|
(xlib.helpers.mkTmpfile "Z" panel "0755" "root" "root")
|
|
];
|
|
};
|
|
|
|
sops.secrets."tape-rotation-env" = {
|
|
# key = "" → decrypt the whole file, not a single key.
|
|
# format = "dotenv" → the file IS one .env ready for environmentFiles:
|
|
# every non-comment KEY=VALUE line lands in the container environment.
|
|
key = "";
|
|
format = "dotenv";
|
|
sopsFile = ./secrets/tape-rotation.env;
|
|
mode = "0400";
|
|
};
|
|
}
|