Merge pull request #138441 from symphorien/nonogroup-fixes-2

Fixes after #133166

Changed files
+32 -16
nixos
modules
+7 -7
nixos/modules/misc/ids.nix
···
#btsync = 113; # unused
#minecraft = 114; #dynamically allocated as of 2021-09-03
vault = 115;
-
rippled = 116;
+
# rippled = 116; #dynamically allocated as of 2021-09-18
murmur = 117;
foundationdb = 118;
newrelic = 119;
···
#redis = 181; removed 2018-01-03
#unifi = 183; dynamically allocated as of 2021-09-17
uptimed = 184;
-
zope2 = 185;
-
ripple-data-api = 186;
+
#zope2 = 185; # dynamically allocated as of 2021-09-18
+
#ripple-data-api = 186; dynamically allocated as of 2021-09-17
mediatomb = 187;
-
rdnssd = 188;
+
#rdnssd = 188; #dynamically allocated as of 2021-09-18
ihaskell = 189;
i2p = 190;
lambdabot = 191;
···
skydns = 197;
# ripple-rest = 198; # unused, removed 2017-08-12
# nix-serve = 199; # unused, removed 2020-12-12
-
tvheadend = 200;
+
#tvheadend = 200; # dynamically allocated as of 2021-09-18
uwsgi = 201;
gitit = 202;
riemanntools = 203;
subsonic = 204;
riak = 205;
-
shout = 206;
+
#shout = 206; # dynamically allocated as of 2021-09-18
gateone = 207;
namecoin = 208;
#lxd = 210; # unused
···
sniproxy = 244;
nzbget = 245;
mosquitto = 246;
-
toxvpn = 247;
+
#toxvpn = 247; # dynamically allocated as of 2021-09-18
# squeezelite = 248; # DynamicUser = true
turnserver = 249;
#smokeping = 250;# dynamically allocated as of 2021-09-03
+3 -1
nixos/modules/services/misc/ripple-data-api.nix
···
users.users.ripple-data-api =
{ description = "Ripple data api user";
-
uid = config.ids.uids.ripple-data-api;
+
isSystemUser = true;
+
group = "ripple-data-api";
};
+
users.groups.ripple-data-api = {};
};
}
+5 -3
nixos/modules/services/misc/rippled.nix
···
config = mkIf cfg.enable {
-
users.users.rippled =
-
{ description = "Ripple server user";
-
uid = config.ids.uids.rippled;
+
users.users.rippled = {
+
description = "Ripple server user";
+
isSystemUser = true;
+
group = "rippled";
home = cfg.databasePath;
createHome = true;
};
+
users.groups.rippled = {};
systemd.services.rippled = {
after = [ "network.target" ];
+3 -1
nixos/modules/services/networking/rdnssd.nix
···
users.users.rdnssd = {
description = "RDNSSD Daemon User";
-
uid = config.ids.uids.rdnssd;
+
isSystemUser = true;
+
group = "rdnssd";
};
+
users.groups.rdnssd = {};
};
+3 -1
nixos/modules/services/networking/shout.nix
···
config = mkIf cfg.enable {
users.users.shout = {
-
uid = config.ids.uids.shout;
+
isSystemUser = true;
+
group = "shout";
description = "Shout daemon user";
home = shoutHome;
createHome = true;
};
+
users.groups.shout = {};
systemd.services.shout = {
description = "Shout web IRC client";
+3 -1
nixos/modules/services/networking/toxvpn.nix
···
users.users = {
toxvpn = {
-
uid = config.ids.uids.toxvpn;
+
isSystemUser = true;
+
group = "toxvpn";
home = "/var/lib/toxvpn";
createHome = true;
};
};
+
users.groups.toxvpn = {};
};
}
+3 -1
nixos/modules/services/networking/tvheadend.nix
···
description = "Tvheadend Service user";
home = "/var/lib/tvheadend";
createHome = true;
-
uid = config.ids.uids.tvheadend;
+
isSystemUser = true;
+
group = "tvheadend";
};
+
users.groups.tvheadend = {};
systemd.services.tvheadend = {
description = "Tvheadend TV streaming server";
+5 -1
nixos/modules/services/web-servers/zope2.nix
···
config = mkIf (cfg.instances != {}) {
-
users.users.zope2.uid = config.ids.uids.zope2;
+
users.users.zope2 = {
+
isSystemUser = true;
+
group = "zope2";
+
};
+
users.groups.zope2 = {};
systemd.services =
let