nix/2.home-manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

rclone: respect mounts enable option

Browse source
This commit is contained in:
Jess 2026-01-19 01:22:24 +13:00 • committed by Austin Horstman
parent 83eeebd967
commit 9e07a347f4
2 changed files with 36 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/programs/rclone.nix
View file

@ -356,8 +356,8 @@ in
mount-path = name;
mount = value;
in
[
(lib.nameValuePair "rclone-mount:${replaceSlashes mount-path}@${remote-name}" {
lib.optional mount.enable (
lib.nameValuePair "rclone-mount:${replaceSlashes mount-path}@${remote-name}" {
Unit = {
Description = "Rclone FUSE daemon for ${remote-name}:${mount-path}";
};
@ -382,8 +382,8 @@ in
};
Install.WantedBy = [ "default.target" ];
})
]
}
)
) (lib.attrsToList remote.mounts)
)
(

42
tests/integration/standalone/rclone/mount.nix
View file

@ -26,6 +26,21 @@ let
};
};
};
alices-disabled-remote = {
config = {
type = "sftp";
host = "remote";
user = "alice";
key_pem = "${keyPem}";
known_hosts = "${sshKeys.snakeOilEd25519PublicKey}";
};
mounts = {
"/home/alice/other-files" = {
mountPoint = "/home/alice/other-files";
};
};
};
};
}
'';
@ -43,6 +58,23 @@ in
remote.wait_for_unit("network.target")
remote.wait_for_unit("multi-user.target")
succeed_as_alice(
"mkdir -p /home/alice/.ssh",
"install -m644 ${module} /home/alice/.config/home-manager/test-remote.nix"
)
actual = succeed_as_alice("home-manager switch")
expected = "rclone-config.service"
assert "Starting units: " in actual and expected in actual, \
f"expected home-manager switch to contain {expected}, but got {actual}"
with subtest("Disabled remotes aren't created"):
svc_name = "rclone-mount:.home.alice.other-files@alices-disabled-remote.service"
status, out = machine.systemctl(f"status {svc_name}", "alice")
assert status != 0, \
f"The disabled mount {svc_name} was created"
with subtest("Mount a remote (sftp)"):
# https://rclone.org/commands/rclone_mount/#vfs-directory-cache
# Sending a SIGHUP evicts every dcache entry
@ -55,16 +87,6 @@ in
box=remote
)
succeed_as_alice(
"mkdir -p /home/alice/.ssh",
"install -m644 ${module} /home/alice/.config/home-manager/test-remote.nix"
)
actual = succeed_as_alice("home-manager switch")
expected = "rclone-config.service"
assert "Starting units: " in actual and expected in actual, \
f"expected home-manager switch to contain {expected}, but got {actual}"
# remote -> machine
succeed_as_alice(
"mkdir /home/alice/files",