1719d54ee0
- New unified flake with two nixpkgs channels (unstable for desktops, 25.11 for muffin)
- modules/common-{doas,shell-fish,nix}.nix extracted from duplicated blocks
- modules/desktop-common.nix: renamed from system/common.nix; secret paths point to secrets/desktop/
- hosts/{mreow,yarn}/default.nix import desktop-common; yarn imports modules/no-rgb.nix
- hosts/muffin/default.nix imports common-* + server-prefixed modules + services/; duplicate doas/fish/nix blocks removed; gc retention preserved as mkForce override
- modules/age-secrets.nix: file paths → ../secrets/server/*.age
- services/{minecraft,matrix/livekit}: secret paths → ../secrets/server/
- home/profiles/*.nix: ./progs/ → ../progs/
- hosts/{mreow,yarn}/home.nix: imports rewired to ../../home/profiles/ and ../../home/progs/
- home/progs/pi.nix and hosts/yarn/home.nix: secret reads → ../../secrets/home/
- tests/*.nix: ../modules/security.nix → ../modules/server-security.nix; ../modules/overlays.nix → ../lib/overlays.nix
- lib/default.nix: takes explicit lib param (defaults to nixpkgs-stable.lib)
54 lines
1.4 KiB
Nix
54 lines
1.4 KiB
Nix
{
|
|
config,
|
|
lib,
|
|
pkgs,
|
|
...
|
|
}:
|
|
let
|
|
testPkgs = pkgs.appendOverlays [ (import ../lib/overlays.nix) ];
|
|
in
|
|
testPkgs.testers.runNixOSTest {
|
|
name = "file-perms test";
|
|
|
|
nodes.machine =
|
|
{ pkgs, ... }:
|
|
{
|
|
imports = [
|
|
(lib.serviceFilePerms "test-service" [
|
|
"Z /tmp/test-perms-dir 0750 nobody nogroup"
|
|
])
|
|
];
|
|
|
|
systemd.services."test-service" = {
|
|
serviceConfig = {
|
|
Type = "oneshot";
|
|
RemainAfterExit = true;
|
|
ExecStart = lib.getExe pkgs.bash;
|
|
};
|
|
};
|
|
};
|
|
|
|
testScript = ''
|
|
start_all()
|
|
machine.wait_for_unit("multi-user.target")
|
|
|
|
# Create test directory with wrong permissions
|
|
machine.succeed("mkdir -p /tmp/test-perms-dir")
|
|
machine.succeed("chown root:root /tmp/test-perms-dir")
|
|
machine.succeed("chmod 700 /tmp/test-perms-dir")
|
|
|
|
# Start service -- this should pull in test-service-file-perms
|
|
machine.succeed("systemctl start test-service")
|
|
|
|
# Verify file-perms service ran and is active
|
|
machine.succeed("systemctl is-active test-service-file-perms.service")
|
|
|
|
# Verify permissions were fixed by tmpfiles
|
|
result = machine.succeed("stat -c '%U:%G' /tmp/test-perms-dir").strip()
|
|
assert result == "nobody:nogroup", f"Expected nobody:nogroup, got {result}"
|
|
|
|
result = machine.succeed("stat -c '%a' /tmp/test-perms-dir").strip()
|
|
assert result == "750", f"Expected 750, got {result}"
|
|
'';
|
|
}
|