titaniumtown/server-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zfs: fix qbittorrent

Browse Source
This commit is contained in:
Simon Gardling 2025-11-20 16:17:09 -05:00
parent ae5189b6c6
commit 223910744a
Signed by: titaniumtown
GPG Key ID: 9AB28AC10ECE533D
3 changed files with 67 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib.nix
View File

@ -69,9 +69,10 @@ inputs.nixpkgs.lib.extend (
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
RemainAfterExit = true; RemainAfterExit = true;
ExecStart = lib.getExe ( ExecStart = [
(lib.getExe (
pkgs.writeShellApplication { pkgs.writeShellApplication {
name = "ensure-zfs-mounts-with-pool-${serviceName}"; name = "ensure-zfs-mounts-with-pool-${serviceName}-${zpool}";
runtimeInputs = with pkgs; [ runtimeInputs = with pkgs; [
gawk gawk
coreutils coreutils
@ -81,7 +82,7 @@ inputs.nixpkgs.lib.extend (
text = '' text = ''
set -euo pipefail set -euo pipefail
echo "Ensuring ZFS mounts for service: ${serviceName}" echo "Ensuring ZFS mounts for service: ${serviceName} (pool: ${zpool})"
echo "Directories: ${lib.strings.concatStringsSep ", " dirs}" echo "Directories: ${lib.strings.concatStringsSep ", " dirs}"
# Validate mounts exist (ensureZfsMounts already has proper PATH) # Validate mounts exist (ensureZfsMounts already has proper PATH)
@ -96,7 +97,6 @@ inputs.nixpkgs.lib.extend (
exit 1 exit 1
fi fi
# This loop handles variable number of directories, shellcheck false positive
# shellcheck disable=SC2043 # shellcheck disable=SC2043
for target in ${lib.strings.concatStringsSep " " dirs}; do for target in ${lib.strings.concatStringsSep " " dirs}; do
echo "Checking: $target" echo "Checking: $target"
@ -126,10 +126,11 @@ inputs.nixpkgs.lib.extend (
echo "All paths verified successfully on pool '${zpool}'" echo "All paths verified successfully on pool '${zpool}'"
''} ''}
echo "Mount validation completed for ${serviceName}" echo "Mount validation completed for ${serviceName} (pool: ${zpool})"
''; '';
} }
); ))
];
}; };
}; };

3
services/qbittorrent.nix
View File

@ -11,6 +11,9 @@
(lib.serviceMountWithZpool "qbittorrent" service_configs.zpool_hdds [ (lib.serviceMountWithZpool "qbittorrent" service_configs.zpool_hdds [
service_configs.torrents_path service_configs.torrents_path
config.services.qbittorrent.serverConfig.Preferences.Downloads.TempPath config.services.qbittorrent.serverConfig.Preferences.Downloads.TempPath
])
(lib.serviceMountWithZpool "qbittorrent" service_configs.zpool_ssds [
"${config.services.qbittorrent.profileDir}/qBittorrent" "${config.services.qbittorrent.profileDir}/qBittorrent"
]) ])
(lib.vpnNamespaceOpenPort config.services.qbittorrent.webuiPort "qbittorrent") (lib.vpnNamespaceOpenPort config.services.qbittorrent.webuiPort "qbittorrent")

15
tests/zfs.nix
View File

@ -21,6 +21,10 @@ testPkgs.testers.runNixOSTest {
# Test service with paths outside zpool (should fail assertion) # Test service with paths outside zpool (should fail assertion)
(lib.serviceMountWithZpool "invalid-service" "rpool2" [ "/mnt/rpool_data" ]) (lib.serviceMountWithZpool "invalid-service" "rpool2" [ "/mnt/rpool_data" ])
# Test multi-command logic: service with multiple serviceMountWithZpool calls
(lib.serviceMountWithZpool "multi-service" "rpool" [ "/mnt/rpool_data" ])
(lib.serviceMountWithZpool "multi-service" "rpool2" [ "/mnt/rpool2_data" ])
]; ];
virtualisation = { virtualisation = {
@ -56,6 +60,14 @@ testPkgs.testers.runNixOSTest {
ExecStart = lib.getExe pkgs.bash; ExecStart = lib.getExe pkgs.bash;
}; };
}; };
systemd.services."multi-service" = {
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
ExecStart = lib.getExe pkgs.bash;
};
};
}; };
testScript = '' testScript = ''
@ -105,6 +117,7 @@ testPkgs.testers.runNixOSTest {
assert "Expected pool: rpool2" in journal_output assert "Expected pool: rpool2" in journal_output
assert "Actual pool: rpool" in journal_output assert "Actual pool: rpool" in journal_output
print("SUCCESS: Runtime validation correctly detected zpool mismatch!") machine.succeed("systemctl start multi-service")
machine.succeed("systemctl is-active multi-service-mounts.service")
''; '';
} }