This commit is contained in:
2023-12-05 12:34:41 +01:00
parent 7bbca7d2ae
commit 76e8ef8428
3 changed files with 9 additions and 36 deletions

View File

@@ -12,7 +12,6 @@
./utils/modules/netdata.nix ./utils/modules/netdata.nix
# fw # fw
./modules/staticids.nix
./modules/networking.nix ./modules/networking.nix
./modules/firewall.nix ./modules/firewall.nix
./modules/dhcp4.nix ./modules/dhcp4.nix

View File

@@ -1,35 +1,8 @@
{ config, lib, ... }:
with lib;
let
cfg = config.cids;
in
{ {
options.services.cids = {
uids = mkOption {
readOnly = true;
description = lib.mdDoc ''
The user IDs used for containers.
'';
type = types.attrsOf types.int;
};
gids = mkOption {
readOnly = true;
description = lib.mdDoc ''
The group IDs used for containers.
'';
type = types.attrsOf types.int;
};
};
config = {
services.cids = {
uids = { uids = {
unbound = 10001; unbound = 10001;
}; };
gids = { gids = {
unbound = 10001; unbound = 10001;
}; };
};
};
} }

View File

@@ -1,5 +1,6 @@
{ config, ... }: { config, ... }:
let let
cids = import ../modules/staticids.nix;
domain = "ns.cloonar.com"; domain = "ns.cloonar.com";
cfg = { cfg = {
server = { server = {
@@ -133,10 +134,10 @@ in {
users.users.unbound = { users.users.unbound = {
group = "unbound"; group = "unbound";
isSystemUser = true; isSystemUser = true;
uid = config.services.cids.uids.unbound; uid = cids.uids.unbound;
}; };
users.groups.unbound = { users.groups.unbound = {
gid = config.services.cids.gids.unbound; gid = cids.gids.unbound;
}; };
security.acme.certs."${domain}" = { security.acme.certs."${domain}" = {
@@ -175,10 +176,10 @@ in {
users.users.unbound = { users.users.unbound = {
group = "unbound"; group = "unbound";
isSystemUser = true; isSystemUser = true;
uid = config.services.cids.uids.unbound; uid = cids.uids.unbound;
}; };
users.groups.unbound = { users.groups.unbound = {
gid = config.services.cids.gids.unbound; gid = cids.gids.unbound;
}; };
services.unbound = { services.unbound = {
enable = true; enable = true;