Merge pull request #65566 from rasendubi/syncthing-group-fix

syncthing: create default group if not overridden
This commit is contained in:
Robin Gloster 2019-08-01 23:17:37 +00:00 committed by GitHub
commit 443b0f6332
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -372,16 +372,18 @@ in {
systemd.packages = [ pkgs.syncthing ]; systemd.packages = [ pkgs.syncthing ];
users = mkIf (cfg.systemService && cfg.user == defaultUser) { users.users = mkIf (cfg.systemService && cfg.user == defaultUser) {
users."${defaultUser}" = "${defaultUser}" =
{ group = cfg.group; { group = cfg.group;
home = cfg.dataDir; home = cfg.dataDir;
createHome = true; createHome = true;
uid = config.ids.uids.syncthing; uid = config.ids.uids.syncthing;
description = "Syncthing daemon user"; description = "Syncthing daemon user";
}; };
};
groups."${defaultUser}".gid = users.groups = mkIf (cfg.systemService && cfg.group == defaultUser) {
"${defaultUser}".gid =
config.ids.gids.syncthing; config.ids.gids.syncthing;
}; };