Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 41dac4bf9fde
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 443b0f63323b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 29, 2019

  1. syncthing: create default group if not overridden 

    The following configuration generates a systemd unit that doesn't
start.
```nix
{
  services.syncthing = {
    enable = true;
    user = "my-user";
  };
}
```

It fails with
```
systemd[1]: Started Syncthing service.
systemd[6745]: syncthing.service: Failed to determine group credentials: No such process
systemd[6745]: syncthing.service: Failed at step GROUP spawning /nix/store/n1ydz3i08nqp1ajc50ycy1zribmphqc9-syncthing-1.1.4-bin/bin/syncthing: No such process
systemd[1]: syncthing.service: Main process exited, code=exited, status=216/GROUP
systemd[1]: syncthing.service: Failed with result 'exit-code'.
```

This is due to the fact that `syncthing` group (default) is not
created if the user is overridden.

Add a separate check for setting up the default group, so that
user/group are created independently.
    @rasendubi
    rasendubi committed Jul 29, 2019
    Copy the full SHA
    e50539f View commit details

Commits on Aug 1, 2019

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

    syncthing: create default group if not overridden
    @globin
    globin authored Aug 1, 2019
    Copy the full SHA
    443b0f6 View commit details
Showing with 5 additions and 3 deletions.
  1. +5 −3 nixos/modules/services/networking/syncthing.nix
8 changes: 5 additions & 3 deletions nixos/modules/services/networking/syncthing.nix
View file
Original file line number Diff line number Diff line change
@@ -372,16 +372,18 @@ in {

systemd.packages = [ pkgs.syncthing ];

users = mkIf (cfg.systemService && cfg.user == defaultUser) {
users."${defaultUser}" =
users.users = mkIf (cfg.systemService && cfg.user == defaultUser) {
"${defaultUser}" =
{ group = cfg.group;
home = cfg.dataDir;
createHome = true;
uid = config.ids.uids.syncthing;
description = "Syncthing daemon user";
};
};

groups."${defaultUser}".gid =
users.groups = mkIf (cfg.systemService && cfg.group == defaultUser) {
"${defaultUser}".gid =
config.ids.gids.syncthing;
};