Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-09-19 18:01:13 +00:00 committed by GitHub
commit 78ca5a3e45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 32 additions and 16 deletions

View File

@ -153,7 +153,7 @@ in
#btsync = 113; # unused #btsync = 113; # unused
#minecraft = 114; #dynamically allocated as of 2021-09-03 #minecraft = 114; #dynamically allocated as of 2021-09-03
vault = 115; vault = 115;
rippled = 116; # rippled = 116; #dynamically allocated as of 2021-09-18
murmur = 117; murmur = 117;
foundationdb = 118; foundationdb = 118;
newrelic = 119; newrelic = 119;
@ -217,10 +217,10 @@ in
#redis = 181; removed 2018-01-03 #redis = 181; removed 2018-01-03
#unifi = 183; dynamically allocated as of 2021-09-17 #unifi = 183; dynamically allocated as of 2021-09-17
uptimed = 184; uptimed = 184;
zope2 = 185; #zope2 = 185; # dynamically allocated as of 2021-09-18
ripple-data-api = 186; #ripple-data-api = 186; dynamically allocated as of 2021-09-17
mediatomb = 187; mediatomb = 187;
rdnssd = 188; #rdnssd = 188; #dynamically allocated as of 2021-09-18
ihaskell = 189; ihaskell = 189;
i2p = 190; i2p = 190;
lambdabot = 191; lambdabot = 191;
@ -231,13 +231,13 @@ in
skydns = 197; skydns = 197;
# ripple-rest = 198; # unused, removed 2017-08-12 # ripple-rest = 198; # unused, removed 2017-08-12
# nix-serve = 199; # unused, removed 2020-12-12 # nix-serve = 199; # unused, removed 2020-12-12
tvheadend = 200; #tvheadend = 200; # dynamically allocated as of 2021-09-18
uwsgi = 201; uwsgi = 201;
gitit = 202; gitit = 202;
riemanntools = 203; riemanntools = 203;
subsonic = 204; subsonic = 204;
riak = 205; riak = 205;
shout = 206; #shout = 206; # dynamically allocated as of 2021-09-18
gateone = 207; gateone = 207;
namecoin = 208; namecoin = 208;
#lxd = 210; # unused #lxd = 210; # unused
@ -276,7 +276,7 @@ in
sniproxy = 244; sniproxy = 244;
nzbget = 245; nzbget = 245;
mosquitto = 246; mosquitto = 246;
toxvpn = 247; #toxvpn = 247; # dynamically allocated as of 2021-09-18
# squeezelite = 248; # DynamicUser = true # squeezelite = 248; # DynamicUser = true
turnserver = 249; turnserver = 249;
#smokeping = 250;# dynamically allocated as of 2021-09-03 #smokeping = 250;# dynamically allocated as of 2021-09-03

View File

@ -187,7 +187,9 @@ in {
users.users.ripple-data-api = users.users.ripple-data-api =
{ description = "Ripple data api user"; { description = "Ripple data api user";
uid = config.ids.uids.ripple-data-api; isSystemUser = true;
group = "ripple-data-api";
}; };
users.groups.ripple-data-api = {};
}; };
} }

View File

@ -407,12 +407,14 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
users.users.rippled = users.users.rippled = {
{ description = "Ripple server user"; description = "Ripple server user";
uid = config.ids.uids.rippled; isSystemUser = true;
group = "rippled";
home = cfg.databasePath; home = cfg.databasePath;
createHome = true; createHome = true;
}; };
users.groups.rippled = {};
systemd.services.rippled = { systemd.services.rippled = {
after = [ "network.target" ]; after = [ "network.target" ];

View File

@ -72,8 +72,10 @@ in
users.users.rdnssd = { users.users.rdnssd = {
description = "RDNSSD Daemon User"; description = "RDNSSD Daemon User";
uid = config.ids.uids.rdnssd; isSystemUser = true;
group = "rdnssd";
}; };
users.groups.rdnssd = {};
}; };

View File

@ -83,11 +83,13 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
users.users.shout = { users.users.shout = {
uid = config.ids.uids.shout; isSystemUser = true;
group = "shout";
description = "Shout daemon user"; description = "Shout daemon user";
home = shoutHome; home = shoutHome;
createHome = true; createHome = true;
}; };
users.groups.shout = {};
systemd.services.shout = { systemd.services.shout = {
description = "Shout web IRC client"; description = "Shout web IRC client";

View File

@ -59,10 +59,12 @@ with lib;
users.users = { users.users = {
toxvpn = { toxvpn = {
uid = config.ids.uids.toxvpn; isSystemUser = true;
group = "toxvpn";
home = "/var/lib/toxvpn"; home = "/var/lib/toxvpn";
createHome = true; createHome = true;
}; };
}; };
users.groups.toxvpn = {};
}; };
} }

View File

@ -29,8 +29,10 @@ in
description = "Tvheadend Service user"; description = "Tvheadend Service user";
home = "/var/lib/tvheadend"; home = "/var/lib/tvheadend";
createHome = true; createHome = true;
uid = config.ids.uids.tvheadend; isSystemUser = true;
group = "tvheadend";
}; };
users.groups.tvheadend = {};
systemd.services.tvheadend = { systemd.services.tvheadend = {
description = "Tvheadend TV streaming server"; description = "Tvheadend TV streaming server";

View File

@ -103,7 +103,11 @@ in
config = mkIf (cfg.instances != {}) { config = mkIf (cfg.instances != {}) {
users.users.zope2.uid = config.ids.uids.zope2; users.users.zope2 = {
isSystemUser = true;
group = "zope2";
};
users.groups.zope2 = {};
systemd.services = systemd.services =
let let