better cache management

.github/workflows/diff-pr.yml

@@ -17,18 +17,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
 
-      - name: merge base branch
-        run: |
-          git config user.email "ci@localhost"
-          git config user.name "CI"
-          git fetch origin ${{ github.event.pull_request.base.ref }}
-          git merge --no-edit origin/${{ github.event.pull_request.base.ref }}
-
       - name: worktree base for diff
-        run: git worktree add "$RUNNER_TEMP/base" "origin/${{ github.event.pull_request.base.ref }}"
+        run: git worktree add "$RUNNER_TEMP/base" "${{ github.event.pull_request.base.sha }}"
 
       - name: build closures and render diff
         run: |

.github/workflows/flake-update.yml

@@ -5,19 +5,21 @@ on:
     - cron: "17 4 * * *"
   workflow_dispatch:
 
+permissions:
+  contents: write
+  pull-requests: write
+
 jobs:
   update:
     runs-on: nix
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
 
       - run: nix flake update -L
 
       - name: open/update PR
         env:
-          GH_TOKEN: ${{ secrets.BOT_TOKEN }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           API: ${{ github.api_url }}
           REPO: ${{ github.repository }}
         run: |

.github/workflows/vulnix.yml

@@ -5,6 +5,10 @@ on:
     - cron: "0 6 * * 1"
   workflow_dispatch:
 
+permissions:
+  contents: read
+  issues: write
+
 jobs:
   scan:
     runs-on: nix
@@ -21,7 +25,7 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           API: ${{ github.api_url }}
           REPO: ${{ github.repository }}
-        run: 'nix run -L .#ci -- upsert-issue vulnix "vulnix: known vulnerabilities in system closure" "$RUNNER_TEMP/issue.md"'
+        run: nix run -L .#ci -- upsert-issue vulnix "vulnix: known vulnerabilities in system closure" "$RUNNER_TEMP/issue.md"
 
       - name: close resolved issue
         if: steps.scan.outputs.count == '0'

ci.nix

@@ -1,17 +1,10 @@
 { lib, pkgs }:
-let
-  # vulnix's bundled nix-2.34 broke its own --experimental-features detection
-  nixConf = pkgs.writeText "ci-nix.conf" "experimental-features = nix-command flakes";
-in
 # tools must track ci.py's subprocess calls; nix stays ambient (uses the
 # runner's own nix, not a pinned one).
 pkgs.writers.writePython3Bin "ci" {
   flakeIgnore = [ "E501" ];
   libraries = [ pkgs.python3Packages.subprocess-tee ];
   makeWrapperArgs = [
-    "--set-default"
-    "NIX_USER_CONF_FILES"
-    (toString nixConf)
     "--prefix"
     "PATH"
     ":"

ci.py

@@ -8,7 +8,6 @@ import re
 import subprocess
 import subprocess_tee
 import sys
-import urllib.error
 import urllib.request
 from collections import Counter
 from pathlib import Path
@@ -19,18 +18,13 @@ def run(*args, **kw):
 
 
 def nix(*args):
-    # tee to stderr - stdout leaks into GITHUB_OUTPUT $() captures
-    return subprocess_tee.run(("nix", "--extra-experimental-features", "nix-command flakes", "-L", *args), check=True, text=True, stdout=sys.stderr).stdout
+    return subprocess_tee.run(("nix", "--extra-experimental-features", "nix-command flakes", "-L", *args), check=True, text=True).stdout
 
 
 def git(*args, check=True):
     return run("git", *args, check=check, capture_output=True)
 
 
-class GiteaError(Exception):
-    pass
-
-
 def gitea(method, path, body=None):
     url = f'{os.environ["API"]}/repos/{os.environ["REPO"]}{path}'
     data = json.dumps(body).encode() if body is not None else None
@@ -38,20 +32,13 @@ def gitea(method, path, body=None):
     req.add_header("Authorization", f'token {os.environ["GH_TOKEN"]}')
     if data is not None:
         req.add_header("Content-Type", "application/json")
-    try:
-        with urllib.request.urlopen(req) as resp:
-            raw = resp.read()
-    except urllib.error.HTTPError as e:
-        try:
-            detail = json.loads(e.read()).get("message", e.reason)
-        except (json.JSONDecodeError, UnicodeDecodeError):
-            detail = e.reason
-        raise GiteaError(f"{method} {path}: {e.code} {detail}") from None
+    with urllib.request.urlopen(req) as resp:
+        raw = resp.read()
     return json.loads(raw) if raw else None
 
 
 def find_open_issue(label):
-    issues = gitea("GET", f"/issues?state=open&type=issues&labels={label}")
+    issues = gitea("GET", f"/issues?state=open&labels={label}")
     return issues[0] if issues else None
 
 
@@ -248,7 +235,7 @@ def format_vulnix(vulns):
     for v in vulns:
         for cve in v["affected_by"]:
             score = v.get("cvssv3_basescore", {}).get(cve)
-            desc = v.get("description", {}).get(cve, "").replace("\n", " ").replace("|", "∣")
+            desc = v.get("description", {}).get(cve, "")
             if len(desc) > 120:
                 desc = desc[:117] + "..."
             rows.append((v["pname"], v["version"], cve, score, desc))
@@ -475,24 +462,16 @@ def open_pr(args):
 
     host = os.environ["API"].removesuffix("/api/v1")
     auth = base64.b64encode(f'token:{os.environ["GH_TOKEN"]}'.encode()).decode()
-    push = git("-c", f"http.extraHeader=Authorization: Basic {auth}",
-               "push", "-f", f'{host}/{os.environ["REPO"]}.git', f"HEAD:{args.branch}",
-               check=False)
-    if push.returncode != 0:
-        raise RuntimeError(f"git push failed:\n{push.stderr}")
+    git("-c", f"http.extraHeader=Authorization: Basic {auth}",
+        "push", "-f", f'{host}/{os.environ["REPO"]}.git', f"HEAD:{args.branch}")
 
-    pulls = gitea("GET", f"/pulls?state=open&base_branch={args.base}")
-    existing = next((pr for pr in pulls if pr["head"]["ref"] == args.branch), None)
-    if existing:
-        print(f"PR #{existing['number']} already open, pushed update")
+    owner = os.environ["REPO"].split("/")[0]
+    if gitea("GET", f"/pulls?state=open&head={owner}:{args.branch}"):
         return
     labels = [label_id(args.label)] if args.label else []
-    pr = gitea("POST", "/pulls",
-               {"title": args.title, "head": args.branch, "base": args.base,
-                "body": Path(args.body_file).read_text(), "labels": labels})
-    if not pr or "number" not in pr:
-        raise GiteaError(f"POST /pulls: unexpected response: {json.dumps(pr)}")
-    print(f"opened PR #{pr['number']}")
+    gitea("POST", "/pulls",
+          {"title": args.title, "head": args.branch, "base": args.base,
+           "body": Path(args.body_file).read_text(), "labels": labels})
 
 
 def main():

configuration.nix

@@ -4,28 +4,12 @@
   lib,
   hostInfo,
   customPkgs,
-  flakeRev,
-  deployLabel,
   ...
 }:
 let
   inherit (hostInfo) paths;
 in
 {
-  imports = [ ./modules/autodeploy.nix ];
-
-  services.server-autodeploy = {
-    enable = true;
-    giteaUrl = "https://git.floweytf.com/";
-    giteaRepo = "server/server-config";
-    tokenFile = "${hostInfo.paths.secrets}/gitea-autodeploy-token";
-    allowedSigners = [
-      "flowey@arch namespaces=\"git\" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPaGpTX3EzfezVc2nl3MgsKVamYYP2h2VJaRny8pZkvi"
-    ];
-    stateDir = hostInfo.paths.config;
-    repoOwner = "server";
-  };
-
   assertions =
     let
       isMounted =
@@ -63,7 +47,6 @@ in
 
   time.timeZone = "UTC";
   system.stateVersion = "26.05";
-  system.nixos.label = if deployLabel != null then deployLabel else flakeRev;
 
   nix = {
     settings = {

containers/server-n0/devenv.nix

@@ -0,0 +1,54 @@
+{
+  name,
+  hostInfo,
+  dsl,
+  ...
+}:
+let
+  inherit (dsl) mkContainer mkService;
+  inherit (hostInfo.paths) data secrets;
+in
+mkContainer {
+  inherit name;
+  net.access = [ { to = "@internet"; } ];
+  svc.autoStart = true;
+  resources.fs = {
+    "/config" = {
+      hostPath = "${data}/web/devenv/config";
+      isReadOnly = false;
+    };
+    "/workspace" = {
+      hostPath = "${data}/web/devenv/workspace";
+      isReadOnly = false;
+    };
+    "/run/secrets/code-server-env" = {
+      hostPath = "${secrets}/code-server-env";
+      isReadOnly = true;
+    };
+  };
+  users = [
+    {
+      name = "coder";
+      uid = 1000;
+      home = "/config";
+    }
+  ];
+  service =
+    { pkgs, lib, ... }:
+    mkService {
+      description = "code-server";
+      execStart = "${lib.getExe' pkgs.code-server "code-server"} --bind-addr 0.0.0.0:8080 --user-data-dir /config/data --extensions-dir /config/extensions --auth password /workspace";
+      networkOnline = true;
+      serviceConfig = {
+        EnvironmentFile = "/run/secrets/code-server-env";
+        User = "coder";
+        ReadWritePaths = [
+          "/config"
+          "/workspace"
+        ];
+      };
+    };
+  net.expose.tcp = [ 8080 ];
+  resources.mem = "4G";
+  resources.cpu = 2;
+}

containers/server-n0/git.nix

@@ -53,10 +53,6 @@ in
       systemd.services.gitea.serviceConfig.FailureAction = "exit-force";
     };
     net.expose.tcp = [ 3000 ];
-    miscProperties.nginx = {
-      domain = "git.floweytf.com";
-      port = 3000;
-    };
   };
 
   ci-runner =
@@ -180,9 +176,8 @@ in
               PermitEmptyPasswords = "yes";
             };
           };
-          security.pam.services.sshd.allowNullPassword = true;
           users.users.root.initialHashedPassword = "";
-          services.journald.settings.Journal.ForwardToConsole = "yes";
+          services.journald.extraConfig = "ForwardToConsole=yes";
 
           virtualisation.containerd.enable = true;
           virtualisation.containerd.settings.plugins."io.containerd.snapshotter.v1.overlayfs".mount_options =

containers/server-n0/mail.nix

@@ -146,13 +146,8 @@ let
 in
 mkContainer {
   inherit name;
-  includedInTests = false; # TODO: fixme, clearly mail is flakey
-
   net.access = [ { to = "@internet"; } ];
   svc.autoStart = true;
-  miscProperties.nginx = {
-    domain = "mail.floweytf.com";
-  };
   net.forward.tcp = [
     25
     993

containers/server-n0/maven.nix

@@ -38,8 +38,4 @@ mkContainer {
       environment.JAVA_OPTS = "-Xmx128M";
     };
   net.expose.tcp = [ 8080 ];
-  miscProperties.nginx = {
-    domain = "maven.floweytf.com";
-    port = 8080;
-  };
 }

containers/server-n0/nginx.nix

@@ -7,7 +7,7 @@
   ...
 }:
 let
-  inherit (dsl) mkContainer collectContainers;
+  inherit (dsl) mkContainer;
   inherit (hostInfo.paths) data;
 
   mkNginxConfig =
@@ -40,6 +40,9 @@ let
           defaultLoc = lib.optionalAttrs (upstream != null) {
             "/" = {
               proxyWebsockets = websockets;
+              # avoid startup error when containers aren't registered yet
+              # proxyPass is left unset for that reason, so recommendedProxySettings
+              # won't auto-include its headers here - set them manually to match
               extraConfig = ''
                 set $backend "${upstream.container.name}:${toString upstream.port}";
                 proxy_pass http://$backend;
@@ -154,46 +157,49 @@ let
 
   up = container: port: { inherit container port; };
 
-  discovered = collectContainers "nginx" containers;
-
-  discoveredVhosts = map (
-    { container, data }:
-    {
-      inherit (data) domain;
-    }
-    // lib.optionalAttrs (data ? port) { upstream = up container data.port; }
-    // lib.optionalAttrs (data ? websockets) { inherit (data) websockets; }
-    // lib.optionalAttrs (data ? redirect) { inherit (data) redirect; }
-    // lib.optionalAttrs (data ? listenHttp) { inherit (data) listenHttp; }
-    // lib.optionalAttrs (data ? extraLocations) { inherit (data) extraLocations; }
-  ) discovered;
-
-  extraVhosts = [
-    {
-      domain = "utils.floweytf.com";
-      redirect = false;
-      listenHttp = true;
-      extraLocations = {
-        "/static/" = {
-          alias = "/usr/share/nginx/static/";
-          extraConfig = "autoindex on;";
-        };
-      };
-    }
-  ];
-
-  upstreamContainers = map (e: e.container) (lib.filter ({ data, ... }: data ? port) discovered);
-
-  setup = mkNginxConfig {
-    email = "floweydev@gmail.com";
-    resolver = hostAddr;
-    vhosts = discoveredVhosts ++ extraVhosts;
-  };
+  nginxSetup =
+    hostAddr:
+    mkNginxConfig {
+      email = "floweydev@gmail.com";
+      resolver = hostAddr;
+      vhosts = [
+        {
+          domain = "devenv.floweytf.com";
+          upstream = up containers.devenv 8080;
+        }
+        {
+          domain = "maven.floweytf.com";
+          upstream = up containers.maven 8080;
+        }
+        {
+          domain = "git.floweytf.com";
+          upstream = up containers.git 3000;
+        }
+        {
+          domain = "utils.floweytf.com";
+          redirect = false;
+          listenHttp = true;
+          extraLocations = {
+            "/static/" = {
+              alias = "/usr/share/nginx/static/";
+              extraConfig = "autoindex on;";
+            };
+          };
+        }
+        {
+          # no upstream, vhost only exists for certs
+          domain = "mail.floweytf.com";
+        }
+      ];
+    };
+in
+let
+  setup = nginxSetup hostAddr;
   c = mkContainer {
     inherit name;
     net.access = setup.access ++ [ { to = "@internet"; } ];
     svc.autoStart = true;
-    svc.depends = upstreamContainers;
+    svc.depends = lib.attrVals [ "devenv" "maven" "git" ] containers;
     net.forward.tcp = [
       80
       443
@@ -202,7 +208,6 @@ let
       hostPath = "${data}/core/nginx/acme";
       isReadOnly = false;
     };
-    miscProperties.acmeDomains = map (v: v.domain) (discoveredVhosts ++ extraVhosts);
     inherit (setup) containerConfig;
   };
   inherit (c) hostAddr;

containers/server-n0/ssh.nix

@@ -61,16 +61,12 @@ let
       net ? { },
       resources ? { },
       traits ? [ ],
-      isolation ? { },
     }:
     mkContainer {
       inherit name;
       inherit net resources;
       svc.autoStart = true;
-      isolation = {
-        inherit nixDaemon;
-      }
-      // isolation;
+      isolation.nixDaemon = nixDaemon;
       traits = [ sshTrait ] ++ traits;
       packages = with pkgs; [ tmux ] ++ packages;
       miscProperties = self._sshpiperRegister routingInfo;
@@ -117,28 +113,14 @@ in
   ssh-generic = mkSsh {
     name = "ssh-generic";
     net.access = [ { to = "@internet"; } ];
-    # /dev/kvm keeps its host ownership, so the kvm gid must not be shifted.
-    isolation.privateUsers = "identity";
     resources = {
       fs."/home/runner/data" = {
         hostPath = "${data}/ssh/generic";
         isReadOnly = false;
       };
-      devices = [ "/dev/kvm" ];
       mem = "16G";
       cpu = 65;
     };
-    packages = with pkgs; [ qemu_kvm ];
-    traits = [
-      {
-        containerConfig =
-          { config, ... }:
-          {
-            users.groups.kvm.gid = config.ids.gids.kvm;
-            users.users.runner.extraGroups = [ "kvm" ];
-          };
-      }
-    ];
     routingInfo = [
       {
         username = "autumn";

dsl.nix

@@ -221,17 +221,6 @@ rec {
     `resources.fs`
     : Bind mounts, keyed by mount point.
 
-    `resources.devices`
-    : Host device nodes to expose, as paths. Bound into the container at the
-      same path and added to the unit's `DeviceAllow=` - the cgroup
-      permission alone doesn't get you a working node (nothing can `mknod` a
-      device inside a user namespace), and the bind alone leaves the cgroup
-      denying `open()`, so both are needed. The bind is unconditional, so
-      the device must actually exist on whatever host runs the container.
-      Nodes keep their host ownership, so a consumer inside needs
-      `isolation.privateUsers = "identity"` for the owning gid to mean
-      anything.
-
     `isolation.nixDaemon`
     : Whether the Nix daemon and CLI are available inside the container.
 
@@ -281,7 +270,6 @@ rec {
       cpuQuota = "${toString (cpu * 100)}%";
       memoryMax = resources.mem or "512M";
       bindMounts = resources.fs or { };
-      devices = resources.devices or [ ];
       allowsNixDaemon = isolation.nixDaemon or false;
       privateUsers = isolation.privateUsers or "pick";
 
@@ -289,7 +277,7 @@ rec {
       allBindMounts = builtins.foldl' (acc: t: acc // (t.resources.fs or { })) { } traits // bindMounts;
       userModules = map mkUser (lib.concatMap (t: t.users or [ ]) traits ++ users);
       allPorts = ports ++ map (p: (normalizePort p).container) hostPorts;
-      useIdmap = privateUsers == "pick" || (builtins.isInt privateUsers && privateUsers > 0);
+      useIdmap = privateUsers != "no";
       bindMountExtraFlags = lib.mapAttrsToList (
         mountPoint: bm:
         (if bm.isReadOnly then "--bind-ro=" else "--bind=")
@@ -297,10 +285,6 @@ rec {
         + lib.optionalString useIdmap ":idmap"
       ) allBindMounts;
       bindMountHostPaths = map (bm: bm.hostPath) (lib.attrValues allBindMounts);
-      # DeviceAllow= alone only grants cgroup permission - nspawn can't
-      # mknod a device node inside a user namespace, so the node still
-      # needs an explicit bind from the host.
-      deviceFlags = map (d: "--bind=${d}") devices;
       inherit (deriveIdentity ifPrefix.nspawn name)
         iface
         mac
@@ -379,7 +363,6 @@ rec {
         hostAddr
         bindMountHostPaths
         includedInTests
-        devices
         ;
       bindMounts = allBindMounts;
       kind = "nspawn";
@@ -387,7 +370,7 @@ rec {
       nixosContainer = {
         inherit autoStart privateUsers;
         bindMounts = { };
-        extraFlags = bindMountExtraFlags ++ deviceFlags;
+        extraFlags = bindMountExtraFlags;
         privateNetwork = true;
         extraVeths = linkVeths;
         config =
@@ -520,7 +503,6 @@ rec {
         ;
       inherit needsGateway;
       bindMountHostPaths = map (s: s.source) shares;
-      devices = [ ];
       kind = "vm";
       miscProperties = flattenMiscProp self miscProperties;
       microvmConfig = {
@@ -957,7 +939,6 @@ rec {
           startLimitBurst = 5;
           startLimitIntervalSec = 120;
           unitConfig.RequiresMountsFor = c.bindMountHostPaths;
-          serviceConfig.DeviceAllow = map (d: "${d} rw") c.devices;
         };
 
       # the host end of a link, for both kinds. nixos-containers only configures
@@ -1223,43 +1204,6 @@ rec {
         ) (lib.attrValues autoStartTestContainers)
       );
 
-      exposedTcp = lib.mapAttrs (_: c: c.ports or [ ]) autoStartTestContainers;
-
-      hostAccessTcp = lib.filterAttrs (_: v: v != [ ]) (
-        lib.mapAttrs (
-          _: c: lib.concatMap (a: if a.to == "@host" then a.tcp or [ ] else [ ]) c.access
-        ) autoStartTestContainers
-      );
-
-      pyForwardTcp = lib.concatStringsSep ", " (
-        lib.concatMap (
-          c:
-          map (
-            p:
-            let
-              np = normalizePort p;
-            in
-            "(${toString np.host}, \"${c.name}\", ${toString np.container})"
-          ) c.hostPorts
-        ) (lib.attrValues autoStartTestContainers)
-      );
-
-      nginxBackendPorts = lib.mapAttrs (_: c: c.miscProperties.nginx.port) (
-        lib.filterAttrs (
-          _: c: c.miscProperties ? nginx && c.miscProperties.nginx ? port
-        ) autoStartTestContainers
-      );
-
-      nginxDomainMap = lib.listToAttrs (
-        lib.concatMap (
-          c:
-          lib.optional (c.miscProperties ? nginx && c.miscProperties.nginx ? domain) {
-            name = c.miscProperties.nginx.domain;
-            value = c.name;
-          }
-        ) (lib.attrValues autoStartTestContainers)
-      );
-
       bin = lib.getExe';
 
       testTools = [
@@ -1306,7 +1250,7 @@ rec {
         # containers don't forward journal to console by default
         containers = lib.genAttrs nspawnNames (_: {
           timeoutStartSec = "10min";
-          config.services.journald.settings.Journal.ForwardToConsole = "yes";
+          config.services.journald.extraConfig = "ForwardToConsole=yes";
         });
 
         # a test VM has neither the memory to hand out nor the cores to divide.
@@ -1354,7 +1298,6 @@ rec {
         HOST_ADDR = ${pyDict pyStr (lib.mapAttrs (_: c: c.hostAddr) autoStartTestContainers)}
         IFACE = ${pyDict pyStr (lib.mapAttrs (_: c: c.iface) autoStartTestContainers)}
         KIND = ${pyDict pyStr (lib.mapAttrs (_: c: c.kind) autoStartTestContainers)}
-        DEVICES = ${pyDict pyList (lib.mapAttrs (_: c: c.devices) autoStartTestContainers)}
         # only nspawn guests can be entered with nsenter; a vm has no host-side
         # netns, so every probe that runs *inside* a guest is limited to these
         enterable = [c for c in included if KIND[c] == "nspawn"]
@@ -1367,12 +1310,6 @@ rec {
         # (src, to, tcp ports, udp ports); `to` may be "@host" or "@internet"
         EDGES = [${pyEdges}]
 
-        EXPOSED_TCP = ${pyDict pyInts exposedTcp}
-        HOST_ACCESS_TCP = ${pyDict pyInts hostAccessTcp}
-        FORWARD_TCP = [${pyForwardTcp}]
-        NGINX_BACKENDS = ${pyDict toString nginxBackendPorts}
-        NGINX_DOMAINS = ${pyDict pyStr nginxDomainMap}
-
         NSENTER = "${bin pkgs.util-linux "nsenter"}"
         CURL = "${bin pkgs.curl "curl"}"
         IP = "${bin pkgs.iproute2 "ip"}"

flake.lock

@@ -1,17 +1,5 @@
 {
   "nodes": {
-    "deploy-label": {
-      "flake": false,
-      "locked": {
-        "path": "./misc/deploy-label",
-        "type": "path"
-      },
-      "original": {
-        "path": "./misc/deploy-label",
-        "type": "path"
-      },
-      "parent": []
-    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
@@ -38,11 +26,11 @@
         "spectrum": "spectrum"
       },
       "locked": {
-        "lastModified": 1790890970,
-        "narHash": "sha256-MV/BNWl8docJMxrNtkZ2/iw0FYMesyB69HKkLWk0r5s=",
+        "lastModified": 1786300091,
+        "narHash": "sha256-4UFJOVGpaYtHW5yasSv80MaJxTBYdk2zyf3jhKtt0wA=",
         "owner": "microvm-nix",
         "repo": "microvm.nix",
-        "rev": "3f1540f254fe73ac907281b7de7d396bb3d54850",
+        "rev": "71beea0076cd46dafcee97a5a2e7d00cbba5bd2f",
         "type": "github"
       },
       "original": {
@@ -59,11 +47,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1790093442,
-        "narHash": "sha256-n0t8bN5x0NU9Ugwa/Vr0bcnA4YKA3YmyVg+Vp7t70HU=",
+        "lastModified": 1782711974,
+        "narHash": "sha256-ju0/qU6ZGqRxc5yDhuljrprG0BSPgguc8Kz3txktSjI=",
         "owner": "Floweynt",
         "repo": "monumenta-charm-eval",
-        "rev": "0aaac697ff4d65e7af2fc9bebaf4f479d7c763b6",
+        "rev": "1aa8b532975679787f7c5bed180fd7fc0da6b905",
         "type": "github"
       },
       "original": {
@@ -75,11 +63,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1790822859,
-        "narHash": "sha256-69xHQhAeMAD2wDXO7T2pcOZIF9Sga2W+JkmY2a11Ops=",
+        "lastModified": 1786384358,
+        "narHash": "sha256-RzPPiWeUtuvymnpuEWsdtzli5w4kjZs49FqEs3/1u+I=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c59305bab2065cfecc4944690d9eedbb56f3a9fa",
+        "rev": "2fcb964de67fcf60b43471c55d5d99e61a9ccb5a",
         "type": "github"
       },
       "original": {
@@ -91,7 +79,6 @@
     },
     "root": {
       "inputs": {
-        "deploy-label": "deploy-label",
         "microvm": "microvm",
         "mtce": "mtce",
         "nixpkgs": "nixpkgs"
@@ -100,11 +87,11 @@
     "spectrum": {
       "flake": false,
       "locked": {
-        "lastModified": 1786032750,
-        "narHash": "sha256-+Ba/kIn5BjvV7PN8bWOo7RoqgTY/Yv2M7qeMf3wS2Ag=",
+        "lastModified": 1785761586,
+        "narHash": "sha256-MWOMVqJJERwjQGgRIv8d6rlEBqbLM3VZWxHkNKIIZNw=",
         "ref": "refs/heads/main",
-        "rev": "77d2389874bb092b8dbf05ecc5b1030372e80e98",
-        "revCount": 1417,
+        "rev": "a7762d6f54b40560dd5255ce902e6e6a5d980fe9",
+        "revCount": 1416,
         "type": "git",
         "url": "https://spectrum-os.org/git/spectrum"
       },

flake.nix

@@ -7,17 +7,13 @@
     mtce.inputs.nixpkgs.follows = "nixpkgs";
     microvm.url = "github:microvm-nix/microvm.nix";
     microvm.inputs.nixpkgs.follows = "nixpkgs";
-    deploy-label.url = "path:./misc/deploy-label";
-    deploy-label.flake = false;
   };
 
   outputs =
     {
-      self,
       nixpkgs,
       mtce,
       microvm,
-      deploy-label,
       ...
     }:
     let
@@ -25,14 +21,6 @@
       inherit (nixpkgs) lib;
       pkgs = import nixpkgs { inherit system; };
 
-      flakeRev = self.shortRev or self.dirtyShortRev or "unknown";
-      deployLabel =
-        let
-          labelFile = "${deploy-label}/label";
-          raw = lib.removeSuffix "\n" (builtins.readFile labelFile);
-        in
-        if raw != "" then raw else null;
-
       customPkgs = {
         hopper-rs = pkgs.callPackage ./packages/hopper-rs.nix { };
         sshpiper = pkgs.callPackage ./packages/sshpiper.nix { };
@@ -41,7 +29,6 @@
         server-rebuild = pkgs.callPackage ./packages/server-rebuild.nix { };
         server-status = pkgs.callPackage ./packages/server-status.nix { };
         server-kexec = pkgs.callPackage ./packages/server-kexec.nix { };
-        server-autodeploy = pkgs.callPackage ./packages/server-autodeploy.nix { };
       };
 
       ci = import ./ci.nix { inherit lib pkgs; };
@@ -59,18 +46,12 @@
           server = "/persist/@containers";
           data = "/persist/@containers/data";
           secrets = "/persist/@secrets/";
-          config = "/persist/@config/";
         };
       };
 
       specialArgsFor = hostName: {
         hostInfo = hostInfoFor hostName;
-        inherit
-          inputs
-          customPkgs
-          flakeRev
-          deployLabel
-          ;
+        inherit inputs customPkgs;
       };
 
       hostDefFor =
@@ -166,7 +147,6 @@
           server-rebuild
           server-status
           server-kexec
-          server-autodeploy
           ;
       };
     };

modules/autodeploy.nix

@@ -1,96 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  customPkgs,
-  ...
-}:
-let
-  cfg = config.services.server-autodeploy;
-in
-{
-  options.services.server-autodeploy = {
-    enable = lib.mkEnableOption "automatic deployment from signed git tags";
-
-    interval = lib.mkOption {
-      type = lib.types.str;
-      default = "15min";
-    };
-
-    branch = lib.mkOption {
-      type = lib.types.str;
-      default = "master";
-    };
-
-    giteaUrl = lib.mkOption {
-      type = lib.types.str;
-    };
-
-    giteaRepo = lib.mkOption {
-      type = lib.types.str;
-    };
-
-    tokenFile = lib.mkOption {
-      type = lib.types.str;
-    };
-
-    allowedSigners = lib.mkOption {
-      type = lib.types.listOf lib.types.str;
-      default = [ ];
-    };
-
-    repoOwner = lib.mkOption {
-      type = lib.types.str;
-      description = "User that owns the configuration checkout";
-    };
-
-    stateDir = lib.mkOption {
-      type = lib.types.str;
-    };
-
-    hostname = lib.mkOption {
-      type = lib.types.str;
-      default = config.networking.hostName;
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    systemd.services.server-autodeploy = {
-      description = "Deploy latest signed tag";
-      after = [ "network-online.target" ];
-      wants = [ "network-online.target" ];
-
-      environment = {
-        GITEA_URL = cfg.giteaUrl;
-        GITEA_REPO = cfg.giteaRepo;
-        TOKEN_FILE = cfg.tokenFile;
-        ALLOWED_SIGNERS = builtins.toFile "signers" (lib.join "\n" cfg.allowedSigners);
-        DEPLOY_BRANCH = cfg.branch;
-        STATE_DIR = cfg.stateDir;
-        REPO_DIR = "/persist/@configuration";
-        REPO_OWNER = cfg.repoOwner;
-        HOSTNAME = cfg.hostname;
-      };
-
-      serviceConfig = {
-        Type = "oneshot";
-        ExecStart = lib.getExe customPkgs.server-autodeploy;
-        TimeoutStartSec = "30min";
-      };
-
-      path = [
-        config.nix.package
-        pkgs.nixos-rebuild
-      ];
-    };
-
-    systemd.timers.server-autodeploy = {
-      wantedBy = [ "timers.target" ];
-      timerConfig = {
-        OnBootSec = "2min";
-        OnUnitActiveSec = cfg.interval;
-        RandomizedDelaySec = "2min";
-      };
-    };
-  };
-}

packages/server-autodeploy.nix

@@ -1,18 +0,0 @@
-{
-  writeShellApplication,
-  git,
-  curl,
-  jq,
-  util-linux,
-  openssh,
-}:
-import ./mk-script.nix { inherit writeShellApplication; } {
-  name = "server-autodeploy";
-  runtimeInputs = [
-    git
-    curl
-    jq
-    util-linux
-    openssh
-  ];
-}

scripts/server-autodeploy.sh

@@ -1,64 +0,0 @@
-REPO_DIR="${REPO_DIR:-/persist/@configuration}"
-STATE_DIR="${STATE_DIR:-/persist/@autodeploy}"
-BRANCH="origin/${DEPLOY_BRANCH:-master}"
-
-mkdir -p "$STATE_DIR"
-exec 9>"$STATE_DIR/lock"
-flock -n 9 || { echo "another deploy running"; exit 0; }
-
-runas() { runuser -u "$REPO_OWNER" -- "$@"; }
-
-report_status() {
-  echo "updating status to: $1 - $2"
-  [[ -f "$TOKEN_FILE" ]] || return 0
-  curl -sf -X POST \
-    -H "Authorization: token $(<"$TOKEN_FILE")" \
-    -H "Content-Type: application/json" \
-    -d "$(jq -n --arg s "$1" --arg d "$2" --arg c "deploy/$HOSTNAME" \
-      '{state:$s,description:$d,context:$c}')" \
-    "$GITEA_URL/api/v1/repos/$GITEA_REPO/statuses/$3" >/dev/null
-}
-
-cd "$REPO_DIR"
-
-export GIT_CONFIG_COUNT=2
-export GIT_CONFIG_KEY_0=gpg.format
-export GIT_CONFIG_VALUE_0=ssh
-export GIT_CONFIG_KEY_1=gpg.ssh.allowedSignersFile
-export GIT_CONFIG_VALUE_1="$ALLOWED_SIGNERS"
-
-runas git fetch origin --tags --prune-tags
-
-latest=$(runas git describe --abbrev=0 "$BRANCH" 2>/dev/null) || {
-  echo "no tags on $BRANCH"
-  exit 0
-}
-
-current=$(cat "$STATE_DIR/tag" 2>/dev/null) || true
-[[ "$latest" != "$current" ]] || { echo "already at $latest"; exit 0; }
-
-echo "new tag: $latest (current: ${current:-none})"
-
-runas git tag -v "$latest" || {
-  sha=$(runas git rev-list -1 "$latest")
-  report_status "failure" "tag signature verification failed" "$sha"
-  exit 1
-}
-
-sha=$(runas git rev-list -1 "$latest")
-report_status "pending" "deploying $latest" "$sha"
-
-label_dir=$(mktemp -d)
-echo "$latest" > "$label_dir/label"
-flake_url="git+${GITEA_URL}/${GITEA_REPO}?ref=refs/tags/${latest}&rev=${sha}#$HOSTNAME"
-
-if nixos-rebuild switch --flake "$flake_url" --override-input deploy-label "path:$label_dir"; then
-  rm -rf "$label_dir"
-  echo "$latest" > "$STATE_DIR/tag"
-  report_status "success" "deployed $latest" "$sha"
-  echo "deployed $latest"
-else
-  rm -rf "$label_dir"
-  report_status "failure" "nixos-rebuild failed" "$sha"
-  exit 1
-fi

tests/server-n0/integration.nix

@@ -14,11 +14,13 @@ let
 
   it = dsl.mkIntegrationTest { inherit host testContainers pkgs; };
 
-  nginxAcmeDomains =
-    if testContainers ? nginx && testContainers.nginx.miscProperties ? acmeDomains then
-      testContainers.nginx.miscProperties.acmeDomains
-    else
-      [ ];
+  nginxAcmeDomains = [
+    "devenv.floweytf.com"
+    "maven.floweytf.com"
+    "git.floweytf.com"
+    "utils.floweytf.com"
+    "mail.floweytf.com"
+  ];
 
   nginxAcmeDir = domain: "${serverDataDir}/core/nginx/acme/${domain}";
 
@@ -65,44 +67,9 @@ let
       '';
   sshpiperTestUser = "admin";
 
+  hostExporterPort = 9100;
+  hostCadvisorPort = 9200;
   hostSshdPort = 5952;
-
-  # derive data directories from container bind mounts
-  allDataDirs = lib.unique (
-    lib.concatMap (c: lib.filter (p: lib.hasPrefix serverDataDir p) c.bindMountHostPaths) (
-      lib.attrValues testContainers
-    )
-  );
-
-  mkdirAllDataDirs = lib.concatMapStrings (p: ''mkdir -p "${p}"'' + "\n") allDataDirs;
-
-  # writable data dirs need ownership set to 1000:1000 (the standard
-  # container user uid). services that run as a different user (loki,
-  # prometheus, grafana) fix ownership via StateDirectory on startup.
-  writableDataDirs = lib.unique (
-    lib.concatMap (
-      c:
-      if c.kind == "nspawn" then
-        lib.filter (p: lib.hasPrefix serverDataDir p) (
-          map (bm: bm.hostPath) (lib.attrValues (lib.filterAttrs (_: bm: !bm.isReadOnly) c.bindMounts))
-        )
-      else
-        [ ]
-    ) (lib.attrValues testContainers)
-  );
-
-  chownWritableDataDirs = lib.concatMapStrings (
-    p: ''chown -R 1000:1000 "${p}"'' + "\n"
-  ) writableDataDirs;
-
-  # secret paths needed by test containers
-  secretPaths = lib.unique (
-    lib.concatMap (c: lib.filter (p: lib.hasPrefix serverSecretsDir p) c.bindMountHostPaths) (
-      lib.attrValues testContainers
-    )
-  );
-
-  mkdirSecretParents = lib.concatMapStrings (p: ''mkdir -p "$(dirname '${p}')"'' + "\n") secretPaths;
 in
 {
   name = "integration-${host.hostName}";
@@ -123,33 +90,63 @@ in
           it.serverModule
         ];
 
+        containers.nginx.config = {
+          systemd.services = lib.genAttrs (map (d: "acme-order-renew-${d}") nginxAcmeDomains) (_: {
+            enable = lib.mkForce false;
+          });
+        };
+
         system.activationScripts.test-secrets =
           # bash
           ''
-              mkdir -p /nix/var/nix/db /nix/var/nix/daemon-socket
-              mkdir -p /var/log/journal
-              mkdir -p "${serverSecretsDir}"
+            mkdir -p /nix/var/nix/db /nix/var/nix/daemon-socket
+
+            mkdir -p /var/log/journal
 
-            ${mkdirAllDataDirs}
             ${mkdirAcmeDirs}
-            ${mkdirSecretParents}
-            ${chownWritableDataDirs}
+            mkdir -p "${serverSecretsDir}" \
+              "${serverDataDir}/core/sshpiper" \
+              "${serverDataDir}/core/mail" \
+              "${serverDataDir}/overseer/loki/data" \
+              "${serverDataDir}/overseer/prometheus/data" \
+              "${serverDataDir}/overseer/grafana" \
+              "${serverDataDir}/web/git" \
+              "${serverDataDir}/web/git-ci-runner/nix-rw-store" \
+              "${serverDataDir}/web/git-ci-runner/docker" \
+              "${serverDataDir}/web/git-ci-runner/runner-state" \
+              "${serverSecretsDir}/ci-runner" \
+              "${serverDataDir}/web/reposilite" \
+              "${serverDataDir}/web/devenv/config" \
+              "${serverDataDir}/web/devenv/workspace" \
+              "${serverDataDir}/ssh/generic" \
+              "${serverDataDir}/ssh/nyaa" \
+              "${serverDataDir}/mc/botm" \
+              "${serverDataDir}/mc/rogule-dev" \
+              "${serverDataDir}/mc/rogule-build" \
+              "${serverDataDir}/mc/starwalker" \
+              "${serverDataDir}/mc/tl"
 
-              for keytype in ed25519 rsa ecdsa; do
-                keyfile="${serverSecretsDir}/ssh_host_''${keytype}_key"
-                if [[ ! -f "$keyfile" ]]; then
-                  ${lib.getExe' pkgs.openssh "ssh-keygen"} -q -t "$keytype" -f "$keyfile" -N ""
-                fi
-              done
+            chown -R 1000:1000 \
+              "${serverDataDir}/web/git" \
+              "${serverDataDir}/web/reposilite" \
+              "${serverDataDir}/web/devenv/config" \
+              "${serverDataDir}/web/devenv/workspace" \
+              "${serverDataDir}/core/mail" \
+              "${serverDataDir}/ssh/generic" \
+              "${serverDataDir}/mc/botm" \
+              "${serverDataDir}/mc/rogule-dev" \
+              "${serverDataDir}/mc/rogule-build" \
+              "${serverDataDir}/mc/starwalker" \
+              "${serverDataDir}/mc/tl"
 
-            ${installFakeCerts}
-          ''
-          + lib.optionalString (testContainers ? sshpiper) ''
-            mkdir -p "${serverDataDir}/core/sshpiper/user_${sshpiperTestUser}"
-            install -m 644 ${testSshKey}/key.pub \
-              "${serverDataDir}/core/sshpiper/user_${sshpiperTestUser}/authorized_keys"
-          ''
-          + lib.optionalString (testContainers ? mail) ''
+            for keytype in ed25519 rsa ecdsa; do
+              keyfile="${serverSecretsDir}/ssh_host_''${keytype}_key"
+              if [[ ! -f "$keyfile" ]]; then
+                ${lib.getExe' pkgs.openssh "ssh-keygen"} -q -t "$keytype" -f "$keyfile" -N ""
+              fi
+            done
+
+            # stalwart rejects weak/dictionary passwords
             for f in mail-admin-password mail-account-password; do
               target="${serverSecretsDir}/$f"
               if [[ ! -f "$target" ]]; then
@@ -157,14 +154,22 @@ in
                 chmod 600 "$target"
               fi
             done
+
+            if [[ ! -f "${serverSecretsDir}/ci-runner/token" ]]; then
+              echo "TOKEN=test-registration-token" > "${serverSecretsDir}/ci-runner/token"
+              chmod 600 "${serverSecretsDir}/ci-runner/token"
+            fi
+
+            if [[ ! -f "${serverSecretsDir}/code-server-env" ]]; then
+              echo "test-secret" > "${serverSecretsDir}/code-server-env"
+              chmod 600 "${serverSecretsDir}/code-server-env"
+            fi
+
+            ${installFakeCerts}
+            mkdir -p "${serverDataDir}/core/sshpiper/user_${sshpiperTestUser}"
+            install -m 644 ${testSshKey}/key.pub \
+              "${serverDataDir}/core/sshpiper/user_${sshpiperTestUser}/authorized_keys"
           '';
-      }
-      // lib.optionalAttrs (testContainers ? nginx && nginxAcmeDomains != [ ]) {
-        containers.nginx.config = {
-          systemd.services = lib.genAttrs (map (d: "acme-order-renew-${d}") nginxAcmeDomains) (_: {
-            enable = lib.mkForce false;
-          });
-        };
       };
   };
 
@@ -177,6 +182,8 @@ in
       TEST_SSH_KEY_STORE = "${testSshKey}/key"
 
       SSHPIPER_TEST_USER = "${sshpiperTestUser}"
+      HOST_EXPORTER_PORT = ${toString hostExporterPort}
+      HOST_CADVISOR_PORT = ${toString hostCadvisorPort}
       HOST_SSHD_PORT = ${toString hostSshdPort}
     ''
     + builtins.readFile ./integration.py;

tests/server-n0/integration.py

@@ -27,17 +27,13 @@ if TYPE_CHECKING:
     HOST_ADDR: dict[str, str] = {}
     IFACE: dict[str, str] = {}
     KIND: dict[str, str] = {}
-    DEVICES: dict[str, list[str]] = {}
     EDGES: list[tuple[str, str, list[int], list[int]]] = []
-    EXPOSED_TCP: dict[str, list[int]] = {}
-    HOST_ACCESS_TCP: dict[str, list[int]] = {}
-    FORWARD_TCP: list[tuple[int, str, int]] = []
-    NGINX_BACKENDS: dict[str, int] = {}
-    NGINX_DOMAINS: dict[str, str] = {}
     SSH_KEY: str = ""
     SSH_OPTS: str = ""
     TEST_SSH_KEY_STORE: str = ""
     SSHPIPER_TEST_USER: str = ""
+    HOST_EXPORTER_PORT: int = 0
+    HOST_CADVISOR_PORT: int = 0
     HOST_SSHD_PORT: int = 0
 
 SW = "/run/current-system/sw/bin"
@@ -45,12 +41,6 @@ SH = f"{SW}/sh"
 
 PEER_EDGES = {(src, to) for src, to, _, _ in EDGES if to not in ("@host", "@internet")}
 
-# pre-compute the set of all host-access ports (union across containers)
-ALL_HOST_ACCESS_PORTS = {p for ps in HOST_ACCESS_TCP.values() for p in ps}
-
-# published host ports
-FWD_HOST_PORTS = {hp for hp, _, _ in FORWARD_TCP}
-
 
 def failed_units(node_arg=""):
     out = server.succeed(f"systemctl {node_arg} list-units --state=failed --no-legend --plain || true")
@@ -65,11 +55,6 @@ def container_pid(name):
     return server.succeed(f"machinectl show {name} -p Leader --value").strip()
 
 
-def ct_cmd(name, cmd):
-    pid = container_pid(name)
-    return f"{NSENTER} --mount=/proc/{pid}/ns/mnt --root=/proc/{pid}/root -- {SH} -c '{cmd}'"
-
-
 def net_cmd(name, cmd):
     pid = container_pid(name)
     return f"{NSENTER} --net=/proc/{pid}/ns/net -- {cmd}"
@@ -153,38 +138,46 @@ with subtest("(isolation): internet egress follows the access list"):
         server.fail(net_cmd(name, f"{IP} route show default | grep -q ."))
 
 with subtest("(functional): container DNS still resolves"):
-    src = enterable[0]
-    dst = next(c for c in included if c != src)
     resolved = server.succeed(
-        net_cmd(src, f"{DIG} +short +time=3 @{HOST_ADDR[src]} {dst}.containers")
+        net_cmd("git", f"{DIG} +short +time=3 @{HOST_ADDR['git']} nginx.containers")
     ).strip()
-    assert resolved == ADDR[dst], f"{dst}.containers resolved to {resolved!r}, expected {ADDR[dst]}"
+    assert resolved == ADDR["nginx"], f"nginx.containers resolved to {resolved!r}, expected {ADDR['nginx']}"
 
 with subtest("(functional): web services respond"):
-    for name, port in NGINX_BACKENDS.items():
-        if name in enterable:
-            server.succeed(net_cmd(name, f"{CURL} -sf --max-time 5 -o /dev/null http://{ADDR[name]}:{port}/ >&2"))
+    for name, port in [("devenv", 8080), ("maven", 8080), ("git", 3000)]:
+        server.succeed(net_cmd(name, f"{CURL} -sf --max-time 5 -o /dev/null http://{ADDR[name]}:{port}/ >&2"))
+
+with subtest("(functional): mail accepts connections"):
+    smtp_probe = net_cmd("mail", f"{SH} -c 'exec 3<>/dev/tcp/{ADDR['mail']}/25 && head -1 <&3'")
+    server.wait_until_succeeds(f"{smtp_probe} | grep -q '^220'", timeout=60)
+
+    imap_probe = net_cmd(
+        "mail",
+        f"{TIMEOUT} 3 {OPENSSL} s_client -connect {ADDR['mail']}:993 -quiet -verify_quiet 2>/dev/null",
+    )
+
+    def imap_ready(_):
+        greeting = server.execute(f"echo | {imap_probe} | head -1")[1]
+        return greeting.strip().startswith("* OK")
+
+    retry(imap_ready, timeout_seconds=60)
 
 with subtest("(functional): nginx proxies to backend containers"):
-    if "nginx" in enterable:
-        for domain, backend in NGINX_DOMAINS.items():
-            if backend in included:
-                server.succeed(
-                    net_cmd(
-                        "nginx",
-                        f"{CURL} -sfk --max-time 5 --resolve {domain}:443:{ADDR['nginx']} "
-                        f"https://{domain}/ >&2",
-                    )
-                )
+    server.succeed(
+        net_cmd(
+            "nginx",
+            f"{CURL} -sfk --max-time 5 --resolve git.floweytf.com:443:{ADDR['nginx']} "
+            "https://git.floweytf.com/ >&2",
+        )
+    )
 
 with subtest("(functional): sshpiper authenticates/routes properly"):
-    if "sshpiper" in included:
-        whoami = server.succeed(f"{SSH} {SSH_OPTS} -p 2222 {SSHPIPER_TEST_USER}@{ADDR['sshpiper']} whoami").strip()
-        assert whoami == "runner", f"expected to land as runner, got {whoami}"
-        hostname = server.succeed(
-            f"{SSH} {SSH_OPTS} -p 2222 {SSHPIPER_TEST_USER}@{ADDR['sshpiper']} hostname"
-        ).strip()
-        assert hostname == "ssh-admin", f"expected to land on ssh-admin, got {hostname}"
+    whoami = server.succeed(f"{SSH} {SSH_OPTS} -p 2222 {SSHPIPER_TEST_USER}@{ADDR['sshpiper']} whoami").strip()
+    assert whoami == "runner", f"expected to land as runner, got {whoami}"
+    hostname = server.succeed(
+        f"{SSH} {SSH_OPTS} -p 2222 {SSHPIPER_TEST_USER}@{ADDR['sshpiper']} hostname"
+    ).strip()
+    assert hostname == "ssh-admin", f"expected to land on ssh-admin, got {hostname}"
 
 with subtest("(isolation): every declared container edge connects"):
     for src, to, tcp_ports, _ in EDGES:
@@ -194,136 +187,89 @@ with subtest("(isolation): every declared container edge connects"):
             server.succeed(ct_connect(src, ADDR[to], port))
 
 with subtest("(isolation): undeclared container edges are refused"):
-    tested = 0
-    for src in enterable:
-        for dst in enterable:
-            if src == dst or (src, dst) in PEER_EDGES:
-                continue
-            ports = EXPOSED_TCP.get(dst, [])
-            if not ports:
-                continue
-            server.fail(ct_connect(src, ADDR[dst], ports[0], timeout=2))
-            tested += 1
-    assert tested > 0, "no negative edge cases to test"
+    for src, dst, port in [
+        ("devenv", "git", 3000),
+        ("git", "devenv", 8080),
+        ("maven", "git", 3000),
+        ("nginx", "mail", 25),
+        ("ssh-botm", "ssh-admin", 22),
+        ("overseer", "git", 3000),
+    ]:
+        assert (src, dst) not in PEER_EDGES, f"{src} -> {dst} is a declared edge, not a negative case"
+        server.fail(ct_connect(src, ADDR[dst], port, timeout=2))
 
 with subtest("(isolation): edges are one-way"):
-    tested = 0
-    for src, dst, tcp_ports, _ in EDGES:
-        if dst in ("@host", "@internet") or src not in enterable or dst not in enterable:
-            continue
-        if (dst, src) in PEER_EDGES or not tcp_ports:
-            continue
-        server.succeed(ct_connect(src, ADDR[dst], tcp_ports[0]))
-        tested += 1
-        rev_ports = EXPOSED_TCP.get(src, [])
-        if rev_ports:
-            server.fail(ct_connect(dst, ADDR[src], rev_ports[0], timeout=2))
-    assert tested > 0, "no one-way edge cases to test"
+    assert ("nginx", "git") in PEER_EDGES
+    assert ("git", "nginx") not in PEER_EDGES
+    server.succeed(ct_connect("nginx", ADDR["git"], 3000))
+    server.fail(ct_connect("git", ADDR["nginx"], 443, timeout=2))
 
 with subtest("(isolation): host access allowlist"):
-    for name, ports in HOST_ACCESS_TCP.items():
-        if name in enterable:
-            for port in ports:
-                server.succeed(ct_connect(name, HOST_ADDR[name], port))
-    no_access = [c for c in enterable if c not in HOST_ACCESS_TCP]
-    if no_access and ALL_HOST_ACCESS_PORTS:
-        ct = no_access[0]
-        for port in ALL_HOST_ACCESS_PORTS:
-            server.fail(ct_connect(ct, HOST_ADDR[ct], port, timeout=2))
-            # reaching the port through a different container's host addr is also blocked
-            for other in HOST_ACCESS_TCP:
-                if other in included:
-                    server.fail(ct_connect(ct, HOST_ADDR[other], port, timeout=2))
+    server.succeed(ct_connect("overseer", HOST_ADDR["overseer"], HOST_EXPORTER_PORT))
+    for port in (HOST_EXPORTER_PORT, HOST_CADVISOR_PORT):
+        server.fail(ct_connect("git", HOST_ADDR["git"], port, timeout=2))
+        server.fail(ct_connect("git", HOST_ADDR["overseer"], port, timeout=2))
 
 with subtest("(isolation): host services outside the access list"):
     internet.succeed(connect(server_ip, HOST_SSHD_PORT))
-    for name in enterable:
-        if HOST_SSHD_PORT not in HOST_ACCESS_TCP.get(name, []):
-            server.fail(ct_connect(name, HOST_ADDR[name], HOST_SSHD_PORT, timeout=2))
-            server.fail(ct_connect(name, server_ip, HOST_SSHD_PORT, timeout=2))
+    for name in ("git", "overseer"):
+        server.fail(ct_connect(name, HOST_ADDR[name], HOST_SSHD_PORT, timeout=2))
+        server.fail(ct_connect(name, server_ip, HOST_SSHD_PORT, timeout=2))
 
 with subtest("(isolation): source address spoofing is dropped"):
-    src = enterable[0]
-    other = enterable[1]
-
     before = spoof_counter()
-    server.succeed(net_cmd(src, f"{PING} -c 1 -W 2 {HOST_ADDR[src]} >&2"))
+    server.succeed(net_cmd("git", f"{PING} -c 1 -W 2 {HOST_ADDR['git']} >&2"))
     assert spoof_counter() == before, "an unspoofed packet hit the source guard"
 
-    iface = IFACE[src]
-    server.succeed(net_cmd(src, f"{IP} addr add {ADDR[other]}/32 dev {iface}"))
+    iface = IFACE["git"]
+    server.succeed(net_cmd("git", f"{IP} addr add {ADDR['nginx']}/32 dev {iface}"))
     try:
         server.execute(
-            net_cmd(src, f"{PING} -c 2 -W 2 -I {ADDR[other]} {HOST_ADDR[src]}")
+            net_cmd("git", f"{PING} -c 2 -W 2 -I {ADDR['nginx']} {HOST_ADDR['git']}")
         )
         assert spoof_counter() > before, "a forged source address was not dropped"
     finally:
-        server.succeed(net_cmd(src, f"{IP} addr del {ADDR[other]}/32 dev {iface}"))
+        server.succeed(net_cmd("git", f"{IP} addr del {ADDR['nginx']}/32 dev {iface}"))
 
 with subtest("(isolation): renaming the interface changes nothing"):
-    # find a container with a declared peer edge
-    rename_src = rename_dst = rename_port = None
-    for src, dst, tcp_ports, _ in EDGES:
-        if dst in ("@host", "@internet") or src not in enterable or dst not in included:
-            continue
-        if tcp_ports:
-            rename_src, rename_dst, rename_port = src, dst, tcp_ports[0]
-            break
-
-    assert rename_src is not None and rename_dst is not None and rename_port is not None, \
-        "no peer edge to test interface rename"
-
-    iface, host_addr = IFACE[rename_src], HOST_ADDR[rename_src]
+    iface, host_addr = IFACE["nginx"], HOST_ADDR["nginx"]
 
     def rename(frm, to):
-        server.succeed(net_cmd(rename_src, f"{IP} link set dev {frm} down"))
-        server.succeed(net_cmd(rename_src, f"{IP} link set dev {frm} name {to}"))
-        server.succeed(net_cmd(rename_src, f"{IP} link set dev {to} up"))
+        server.succeed(net_cmd("nginx", f"{IP} link set dev {frm} down"))
+        server.succeed(net_cmd("nginx", f"{IP} link set dev {frm} name {to}"))
+        server.succeed(net_cmd("nginx", f"{IP} link set dev {to} up"))
         for route in (host_addr, f"10.0.0.0/8 via {host_addr}", f"default via {host_addr}"):
-            server.succeed(net_cmd(rename_src, f"{IP} route replace {route} dev {to}"))
+            server.succeed(net_cmd("nginx", f"{IP} route replace {route} dev {to}"))
 
     rename(iface, "evil0")
     try:
-        server.succeed(ct_connect(rename_src, ADDR[rename_dst], rename_port))
+        server.succeed(ct_connect("nginx", ADDR["git"], 3000))
+        server.fail(ct_connect("nginx", ADDR["mail"], 25, timeout=2))
     finally:
         rename("evil0", iface)
 
 with subtest("(isolation): the veth cannot be moved out of the namespace"):
-    ct = enterable[0]
-    server.fail(net_cmd(ct, f"{IP} link set dev {IFACE[ct]} netns 1"))
+    server.fail(net_cmd("git", f"{IP} link set dev {IFACE['git']} netns 1"))
 
 with subtest("(isolation): route bypass"):
-    bypass_ct = next((c for c in enterable if c in no_gateway), None)
-    if bypass_ct is None:
-        bypass_ct = next((c for c in enterable if c not in allow_internet), None)
-    assert bypass_ct is not None, "no container without internet to test route bypass"
-
-    iface = IFACE[bypass_ct]
+    iface = IFACE["hopper"]
     server.succeed(
-        net_cmd(bypass_ct, f"{IP} route replace default via {HOST_ADDR[bypass_ct]} dev {iface} onlink")
+        net_cmd("hopper", f"{IP} route replace default via {HOST_ADDR['hopper']} dev {iface} onlink")
     )
-    server.fail(net_cmd(bypass_ct, f"{CURL} -sf --max-time 5 http://{internet_ip}/ >&2"))
-    unreachable = next(
-        (c for c in included if c != bypass_ct and (bypass_ct, c) not in PEER_EDGES and EXPOSED_TCP.get(c, [])),
-        None,
-    )
-    if unreachable:
-        server.fail(ct_connect(bypass_ct, ADDR[unreachable], EXPOSED_TCP[unreachable][0], timeout=2))
+    server.fail(net_cmd("hopper", f"{CURL} -sf --max-time 5 http://{internet_ip}/ >&2"))
+    server.fail(ct_connect("hopper", ADDR["git"], 3000, timeout=2))
 
 with subtest("(isolation): no IPv6 link-local addresses"):
-    for name in enterable:
+    for name in ["git", "overseer"]:
         assert not has_ipv6_link_local(name), f"{name} still has an IPv6 link-local address"
 
 with subtest("(isolation): published ports grant no reach between containers"):
-    if FWD_HOST_PORTS:
-        ct = next((c for c in enterable if c not in HOST_ACCESS_TCP), enterable[0])
-        for port in FWD_HOST_PORTS:
-            server.fail(ct_connect(ct, HOST_ADDR[ct], port, timeout=2))
-        server.fail(ct_connect(ct, server_ip, next(iter(FWD_HOST_PORTS)), timeout=2))
+    for port in (80, 443, 25565, 22, 25):
+        server.fail(ct_connect("overseer", HOST_ADDR["overseer"], port, timeout=2))
+        server.fail(ct_connect("git", server_ip, port, timeout=2))
 
 with subtest("(isolation): privilege escalation / container escape"):
-    ct = enterable[0]
-    leader = container_pid(ct)
+    leader = container_pid("git")
 
     host_uid = server.succeed(f"awk '/^Uid:/{{print $2}}' /proc/{leader}/status").strip()
     assert host_uid != "0", "container's PID 1 is not idmapped away from host uid 0"
@@ -332,16 +278,28 @@ with subtest("(isolation): privilege escalation / container escape"):
     container_pidns = server.succeed(f"readlink /proc/{leader}/ns/pid").strip()
     assert host_pidns != container_pidns, "container shares the host's PID namespace"
 
-    server.fail(ct_cmd(ct, "touch /nix/store/canary"))
+    server.succeed(
+        f"{NSENTER} --mount=/proc/{leader}/ns/mnt --root=/proc/{leader}/root -- "
+        f"{SH} -c 'echo x >> /var/lib/gitea/canary' >&2"
+    )
+
+    sshpiper_pid = container_pid("sshpiper")
+    server.fail(
+        f"{NSENTER} --mount=/proc/{sshpiper_pid}/ns/mnt --root=/proc/{sshpiper_pid}/root -- "
+        f"{SH} -c 'echo x >> /etc/ssh/ssh_host_ed25519_key' >&2"
+    )
+    server.fail(
+        f"{NSENTER} --mount=/proc/{leader}/ns/mnt --root=/proc/{leader}/root -- "
+        f"{SH} -c 'touch /nix/store/canary' >&2"
+    )
     server.fail(
         f"{NSENTER} --mount=/proc/{leader}/ns/mnt --root=/proc/{leader}/root -- "
         "/run/current-system/sw/bin/test -d /persist >&2"
     )
 
 with subtest("(functional): external clients reach published ports"):
-    for hp, _, _ in FORWARD_TCP:
-        internet.succeed(ext_connect(hp))
-    # a non-published port should be unreachable
+    for port in (80, 25565, 22):
+        internet.succeed(ext_connect(port))
     internet.fail(ext_connect(8080))
 
 with subtest("(functional): no failing-reason restarts"):
@@ -350,61 +308,18 @@ with subtest("(functional): no failing-reason restarts"):
         assert (
             failed_units(f"-M {name}") == []
         ), f"{name} has failed units: {failed_units(f'-M {name}')}"
-        unit = "container" if KIND[name] == "nspawn" else "microvm"
-        restarts = server.succeed(f"systemctl show {unit}@{name}.service -p NRestarts --value").strip()
-        assert restarts == "0", f"{unit}@{name}.service restarted {restarts} times"
+        restarts = server.succeed(f"systemctl show container@{name}.service -p NRestarts --value").strip()
+        assert restarts == "0", f"container@{name}.service restarted {restarts} times"
 
 with subtest("(functional): port forwards survive an nftables reload"):
-    if FORWARD_TCP:
-        hp, ct_name, _ = FORWARD_TCP[0]
-        server.succeed("systemctl reload nftables.service")
-        elements = server.succeed("nft list map ip container-portforward tcp-fwd")
-        assert re.search(rf"\b{hp}\s*:", elements), f"nftables reload emptied the map: {elements!r}"
-        internet.wait_until_succeeds(ext_connect(hp), timeout=30)
+    server.succeed("systemctl reload nftables.service")
+    elements = server.succeed("nft list map ip container-portforward tcp-fwd")
+    assert re.search(r"\b80\s*:", elements), f"nftables reload emptied the map: {elements!r}"
+    internet.wait_until_succeeds(ext_connect(80), timeout=30)
 
 with subtest("(functional): published ports follow the container's lifetime"):
-    if FORWARD_TCP:
-        hp, ct_name, _ = FORWARD_TCP[0]
-        unit = "container" if KIND[ct_name] == "nspawn" else "microvm"
-        server.succeed(f"systemctl stop {unit}@{ct_name}")
-        internet.fail(ext_connect(hp))
-        server.succeed(f"systemctl start {unit}@{ct_name}")
-        server.wait_for_unit(f"{unit}@{ct_name}.service")
-        internet.wait_until_succeeds(ext_connect(hp), timeout=30)
-
-with subtest("(functional): declared devices are usable in-container"):
-    for name, devices in DEVICES.items():
-        for dev in devices:
-            # opened, not stat'd: without DeviceAllow= the node is still visible
-            server.succeed(ct_cmd(name, f"exec 3<> {dev}"))
-
-
-with subtest("(functional): /dev/kvm actually initializes, not just opens"):
-    # a wrong-gid or unmapped node still opens but fails the ioctls qemu
-    # needs, so boot with no disk (never completes) and kill it - the
-    # failure mode this catches is qemu refusing to start at all.
-    for name, devices in DEVICES.items():
-        if "/dev/kvm" not in devices:
-            continue
-        out = server.succeed(
-            ct_cmd(
-                name,
-                f"{TIMEOUT} 3 qemu-system-x86_64 -enable-kvm -m 256 -nographic -no-reboot "
-                ">/tmp/qemu.out 2>&1; cat /tmp/qemu.out",
-            )
-        )
-        assert "Permission denied" not in out, f"{name}: qemu couldn't use /dev/kvm:\n{out}"
-        assert "Could not access KVM" not in out, f"{name}: qemu couldn't use /dev/kvm:\n{out}"
-
-
-with subtest("(isolation): devices reach only the container that declared them"):
-    for name in enterable:
-        for dev in {d for ds in DEVICES.values() for d in ds} - set(DEVICES.get(name, [])):
-            server.fail(ct_cmd(name, f"test -e {dev}"))
-
-
-with subtest("(isolation): identity uid mapping keeps the user namespace"):
-    for name in (n for n, ds in DEVICES.items() if ds):
-        host_ns = server.succeed("readlink /proc/1/ns/user").strip()
-        ct_ns = server.succeed(f"readlink /proc/{container_pid(name)}/ns/user").strip()
-        assert host_ns != ct_ns, f"{name} shares the host user namespace"
+    server.succeed("systemctl stop container@nginx")
+    internet.fail(ext_connect(80))
+    server.succeed("systemctl start container@nginx")
+    server.wait_for_unit("container@nginx.service")
+    internet.wait_until_succeeds(ext_connect(80), timeout=30)