Add some more missing uids/gids

5 files changed, 35 insertions, 15 deletions

diff --git a/modules/services/networking/amuled.nix b/modules/services/networking/amuled.nix
index 658d16af006..8652d0daf4c 100644
--- a/modules/services/networking/amuled.nix
+++ b/modules/services/networking/amuled.nix
@@ -48,6 +48,13 @@ in
     users.extraUsers = mkIf (cfg.user == null) [
       { name = "amule";
         description = "AMule daemon";
+        group = "amule";
+        uid = config.ids.uids.amule;
+      } ];
+
+    users.extraGroups = mkIf (cfg.user == null) [
+      { name = "amule";
+        gid = config.ids.gids.amule;
       } ];
 
     jobs.amuled =
diff --git a/modules/services/networking/gnunet.nix b/modules/services/networking/gnunet.nix
index e0c41dcb188..421c0d9bb69 100644
--- a/modules/services/networking/gnunet.nix
+++ b/modules/services/networking/gnunet.nix
@@ -118,17 +118,15 @@ in
 
   config = mkIf config.services.gnunet.enable {
 
-    users.extraUsers = singleton
-      { name = "gnunet";
-        group = "gnunet";
-        description = "GNUnet User";
-        home = homeDir;
-        createHome = true; 
-      };
+    users.extraUsers.gnunet = {
+      group = "gnunet";
+      description = "GNUnet User";
+      home = homeDir;
+      createHome = true; 
+      uid = config.ids.uids.gnunet;
+    };
 
-    users.extraGroups = singleton
-      { name = "gnunet";
-      };
+    users.extraGroups.gnunet.gid = config.ids.gids.gnunet;
 
     # The user tools that talk to `gnunetd' should come from the same source,
     # so install them globally.
diff --git a/modules/services/networking/minidlna.nix b/modules/services/networking/minidlna.nix
index c240e87e059..55b553cafcc 100644
--- a/modules/services/networking/minidlna.nix
+++ b/modules/services/networking/minidlna.nix
@@ -72,7 +72,13 @@ in
         '') cfg.mediaDirs}
       '';
 
-    users.extraUsers.minidlna.description = "MiniDLNA daemon user";
+    users.extraUsers.minidlna = {
+      description = "MiniDLNA daemon user";
+      group = "minidlna";
+      uid = config.ids.uids.minidlna;
+    };
+
+    users.extraGroups.minidlna.gid = config.ids.gids.minidlna;
 
     systemd.services.minidlna =
       { description = "MiniDLNA Server";
diff --git a/modules/services/networking/oidentd.nix b/modules/services/networking/oidentd.nix
index d730e99af89..a2a555a8ad1 100644
--- a/modules/services/networking/oidentd.nix
+++ b/modules/services/networking/oidentd.nix
@@ -31,10 +31,13 @@ with pkgs.lib;
         exec = "${pkgs.oidentd}/sbin/oidentd -u oidentd -g nogroup";
       };
 
-    users.extraUsers = singleton
-      { name = "oidentd";
-        description = "Ident Protocol daemon user";
-      };
+    users.extraUsers.oidentd = {
+      description = "Ident Protocol daemon user";
+      group = "oidentd";
+      uid = config.ids.uids.oidentd;
+    };
+
+    users.extraGroups.oidentd.gid = config.ids.gids.oidentd;
 
   };
 
diff --git a/modules/services/networking/quassel.nix b/modules/services/networking/quassel.nix
index e8af4926f5c..f3a4e457ec8 100644
--- a/modules/services/networking/quassel.nix
+++ b/modules/services/networking/quassel.nix
@@ -65,8 +65,14 @@ in
     users.extraUsers = mkIf (cfg.user == null) [
       { name = "quassel";
         description = "Quassel IRC client daemon";
+        group = "quassel";
+        uid = config.ids.uids.quassel;
       }];
 
+    users.extraGroups = mkIf (cfg.user == null) [
+      { name = "quassel";
+        gid = config.ids.gids.quassel;
+      }];
 
     jobs.quassel =
       { description = "Quassel IRC client daemon";