felixalb/pvv-nixos-config
1
0
Fork 0
mirror of https://git.pvv.ntnu.no/Drift/pvv-nixos-config.git synced 2026-02-04 01:00:04 +01:00
Code Issues Projects Releases Wiki Activity

modules/rsync-pull-targets: fix multiple pull targets with same user

Browse Source
This commit is contained in:
h7x4
2026-01-27 21:10:17 +09:00
parent 949661113e
commit b77c8eb5c0
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
modules/rsync-pull-targets.nix
View File

@@ -124,16 +124,22 @@ in
services.openssh.enable = true; services.openssh.enable = true;
users.users = lib.pipe cfg.locations [ users.users = lib.pipe cfg.locations [
(lib.filterAttrs (_: value: value.enable)) (lib.filterAttrs (_: value: value.enable))
(lib.mapAttrs' (_: { user, location, rrsyncPackage, rrsyncArgs, authorizedKeysAttrs, publicKey, ... }: let
rrsyncArgString = lib.cli.toCommandLineShellGNU { lib.attrValues
isLong = _: false;
} rrsyncArgs; # Index locations by SSH user
# TODO: handle " in location (lib.foldl (acc: location: acc // {
in { ${location.user} = (acc.${location.user} or [ ]) ++ [ location ];
name = user; }) { })
value.openssh.authorizedKeys.keys = [
"command=\"${lib.getExe rrsyncPackage} ${rrsyncArgString} ${location}\",${lib.concatStringsSep "," authorizedKeysAttrs} ${publicKey}" (lib.mapAttrs (_name: locations: {
]; openssh.authorizedKeys.keys = map ({ user, location, rrsyncPackage, rrsyncArgs, authorizedKeysAttrs, publicKey, ... }: let
rrsyncArgString = lib.cli.toCommandLineShellGNU {
isLong = _: false;
} rrsyncArgs;
# TODO: handle " in location
in "command=\"${lib.getExe rrsyncPackage} ${rrsyncArgString} ${location}\",${lib.concatStringsSep "," authorizedKeysAttrs} ${publicKey}"
) locations;
})) }))
]; ];
}; };