summary refs log tree commit diff
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2019-08-01 23:17:37 +0000
committerGitHub <noreply@github.com>2019-08-01 23:17:37 +0000
commit443b0f63323b09e936bd0fe967899ec4bfec7958 (patch)
treee6bb2bb321946d96a49e7f660e819ac36ac18df9
parent41dac4bf9fde45593ff75d0f2b3f58d835b06266 (diff)
parente50539f7b5a50e57c5807617abe089d467d60f7a (diff)
downloadnixpkgs-443b0f63323b09e936bd0fe967899ec4bfec7958.tar
nixpkgs-443b0f63323b09e936bd0fe967899ec4bfec7958.tar.gz
nixpkgs-443b0f63323b09e936bd0fe967899ec4bfec7958.tar.bz2
nixpkgs-443b0f63323b09e936bd0fe967899ec4bfec7958.tar.lz
nixpkgs-443b0f63323b09e936bd0fe967899ec4bfec7958.tar.xz
nixpkgs-443b0f63323b09e936bd0fe967899ec4bfec7958.tar.zst
nixpkgs-443b0f63323b09e936bd0fe967899ec4bfec7958.zip
Merge pull request #65566 from rasendubi/syncthing-group-fix
syncthing: create default group if not overridden
-rw-r--r--nixos/modules/services/networking/syncthing.nix8
1 files changed, 5 insertions, 3 deletions
diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix
index 8148139c3a8..126f5b7b527 100644
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixos/modules/services/networking/syncthing.nix
@@ -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;
     };