From 6cf8b27fd669eb19b63d4d25acc1b08460c0dd71 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 18 Sep 2021 12:00:00 +0000 Subject: [PATCH 1/7] nixos/rdnssd: define group; fix after #133166 --- nixos/modules/misc/ids.nix | 2 +- nixos/modules/services/networking/rdnssd.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index b958922c0e47..c22075de1c93 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -220,7 +220,7 @@ in zope2 = 185; ripple-data-api = 186; mediatomb = 187; - rdnssd = 188; + #rdnssd = 188; #dynamically allocated as of 2021-09-18 ihaskell = 189; i2p = 190; lambdabot = 191; diff --git a/nixos/modules/services/networking/rdnssd.nix b/nixos/modules/services/networking/rdnssd.nix index 469504c43172..fd04bb8108f0 100644 --- a/nixos/modules/services/networking/rdnssd.nix +++ b/nixos/modules/services/networking/rdnssd.nix @@ -72,8 +72,10 @@ in users.users.rdnssd = { description = "RDNSSD Daemon User"; - uid = config.ids.uids.rdnssd; + isSystemUser = true; + group = "rdnssd"; }; + users.groups.rdnssd = {}; }; From a654d779fe57f8bcbf711353d2caa11423495506 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 18 Sep 2021 12:00:00 +0000 Subject: [PATCH 2/7] nixos/ripple-data-api: define group required after #133166 untested, the module is broken by the removal of couchdb --- nixos/modules/misc/ids.nix | 2 +- nixos/modules/services/misc/ripple-data-api.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index c22075de1c93..cfe0157579e6 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -218,7 +218,7 @@ in #unifi = 183; dynamically allocated as of 2021-09-17 uptimed = 184; zope2 = 185; - ripple-data-api = 186; + #ripple-data-api = 186; dynamically allocated as of 2021-09-17 mediatomb = 187; #rdnssd = 188; #dynamically allocated as of 2021-09-18 ihaskell = 189; diff --git a/nixos/modules/services/misc/ripple-data-api.nix b/nixos/modules/services/misc/ripple-data-api.nix index 9fab462f7e3b..93eba98b7d30 100644 --- a/nixos/modules/services/misc/ripple-data-api.nix +++ b/nixos/modules/services/misc/ripple-data-api.nix @@ -187,7 +187,9 @@ in { 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 = {}; }; } From feeca7dd55f4e793487238311261ba45baf97684 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 18 Sep 2021 12:00:00 +0000 Subject: [PATCH 3/7] nixos/rippled: define group, fix eval after #133166 --- nixos/modules/misc/ids.nix | 2 +- nixos/modules/services/misc/rippled.nix | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index cfe0157579e6..506b90d060a8 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -153,7 +153,7 @@ in #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; diff --git a/nixos/modules/services/misc/rippled.nix b/nixos/modules/services/misc/rippled.nix index 2fce3b9dc94c..8cdfe0875d89 100644 --- a/nixos/modules/services/misc/rippled.nix +++ b/nixos/modules/services/misc/rippled.nix @@ -407,12 +407,14 @@ in 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" ]; From d09ab77588852a9d30e7f85f85d5266f50f59f78 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 18 Sep 2021 12:00:00 +0000 Subject: [PATCH 4/7] nixos/shout: define group, fix eval after #133166 --- nixos/modules/misc/ids.nix | 2 +- nixos/modules/services/networking/shout.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 506b90d060a8..61a472c6adfd 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -237,7 +237,7 @@ in riemanntools = 203; subsonic = 204; riak = 205; - shout = 206; + #shout = 206; # dynamically allocated as of 2021-09-18 gateone = 207; namecoin = 208; #lxd = 210; # unused diff --git a/nixos/modules/services/networking/shout.nix b/nixos/modules/services/networking/shout.nix index 405808491ea4..cca03a8f88a1 100644 --- a/nixos/modules/services/networking/shout.nix +++ b/nixos/modules/services/networking/shout.nix @@ -83,11 +83,13 @@ in { 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"; From fd04a872bcc94c8eba9a34328d593e1d9d62f250 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 18 Sep 2021 12:00:00 +0000 Subject: [PATCH 5/7] nixos/toxvpn: define group, fix eval after #133166 --- nixos/modules/misc/ids.nix | 2 +- nixos/modules/services/networking/toxvpn.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 61a472c6adfd..96626a96b958 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -276,7 +276,7 @@ in 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 diff --git a/nixos/modules/services/networking/toxvpn.nix b/nixos/modules/services/networking/toxvpn.nix index 9e97faeebc1e..1765ef3ea2d9 100644 --- a/nixos/modules/services/networking/toxvpn.nix +++ b/nixos/modules/services/networking/toxvpn.nix @@ -59,10 +59,12 @@ with lib; users.users = { toxvpn = { - uid = config.ids.uids.toxvpn; + isSystemUser = true; + group = "toxvpn"; home = "/var/lib/toxvpn"; createHome = true; }; }; + users.groups.toxvpn = {}; }; } From 23d14d89b8678944f8f8211f6366bba3d54f930c Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 18 Sep 2021 12:00:00 +0000 Subject: [PATCH 6/7] nixos/tvheadend: define group, fix eval after #133166 --- nixos/modules/misc/ids.nix | 2 +- nixos/modules/services/networking/tvheadend.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 96626a96b958..001d5805e4ac 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -231,7 +231,7 @@ in 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; diff --git a/nixos/modules/services/networking/tvheadend.nix b/nixos/modules/services/networking/tvheadend.nix index ccf879996631..19a10a03bd9b 100644 --- a/nixos/modules/services/networking/tvheadend.nix +++ b/nixos/modules/services/networking/tvheadend.nix @@ -29,8 +29,10 @@ in 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"; From 8ba5f8115c6a21d98213f08716aae2f386443c26 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 18 Sep 2021 12:00:00 +0000 Subject: [PATCH 7/7] nixos/zope2: define group untested as the module is broken (attribute 'modules' missing) --- nixos/modules/misc/ids.nix | 2 +- nixos/modules/services/web-servers/zope2.nix | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 001d5805e4ac..5f56e0602279 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -217,7 +217,7 @@ in #redis = 181; removed 2018-01-03 #unifi = 183; dynamically allocated as of 2021-09-17 uptimed = 184; - zope2 = 185; + #zope2 = 185; # dynamically allocated as of 2021-09-18 #ripple-data-api = 186; dynamically allocated as of 2021-09-17 mediatomb = 187; #rdnssd = 188; #dynamically allocated as of 2021-09-18 diff --git a/nixos/modules/services/web-servers/zope2.nix b/nixos/modules/services/web-servers/zope2.nix index 3abd506827c0..ab12e87502eb 100644 --- a/nixos/modules/services/web-servers/zope2.nix +++ b/nixos/modules/services/web-servers/zope2.nix @@ -103,7 +103,11 @@ in 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