dns refactor

This commit is contained in:
ari committed 2026-09-26 02:41:43 -04:00
1 parent 09e2e03423
commit 045702e909
19 files changed
+118 -385

No files matched your search

+4 -4
View File
@@ -64,14 +64,12 @@ Two predefined lab networks are available:
skyg.nixos.common.containers.networks.macvlanLab = {
enable = true;
parent = "eno1";
ipRange = "10.0.101.16/28";
};
# ipvlan L2 mode (host can reach its own containers — preferred)
skyg.nixos.common.containers.networks.ipvlanLab = {
enable = true;
parent = "eno1";
ipRange = "10.0.101.16/28";
};
```
@@ -93,8 +91,10 @@ skyg.nixos.common.containers.networks.extra.myNet = {
};
```
Predefined fields: `enable`, `parent`, `subnet` (default `10.0.0.0/16`), `gateway` (default
`10.0.0.1`), `ipRange`, `internal`. Extra networks also have `name`, `driver`, `driverOpts`.
Predefined fields: `enable`, `parent`, `subnet`, `gateway`, `ipRange`, `internal`. `subnet`,
`gateway`, and `ipRange` default to `skyg.internalNetworkingMap.appNetwork` (see
`modules/main.nix`), so the lab network is declared once. Extra networks also have `name`,
`driver`, `driverOpts`.
Works with both docker and podman.
## Container service groups (`skyg.nixos.common.container-services`)
+6 -6
View File
@@ -70,19 +70,19 @@ in
subnet = lib.mkOption {
type = lib.types.str;
default = "10.0.0.0/16";
default = config.skyg.internalNetworkingMap.appNetwork.subnet;
description = "IPv4 subnet.";
};
gateway = lib.mkOption {
type = lib.types.str;
default = "10.0.0.1";
default = config.skyg.internalNetworkingMap.appNetwork.gateway;
description = "IPv4 gateway.";
};
ipRange = lib.mkOption {
type = lib.types.nullOr lib.types.str;
default = null;
default = config.skyg.internalNetworkingMap.appNetwork.ipRange;
description = "IPv4 range for dynamic address allocation (--ip-range).";
};
@@ -124,19 +124,19 @@ in
subnet = lib.mkOption {
type = lib.types.str;
default = "10.0.0.0/16";
default = config.skyg.internalNetworkingMap.appNetwork.subnet;
description = "IPv4 subnet.";
};
gateway = lib.mkOption {
type = lib.types.str;
default = "10.0.0.1";
default = config.skyg.internalNetworkingMap.appNetwork.gateway;
description = "IPv4 gateway.";
};
ipRange = lib.mkOption {
type = lib.types.nullOr lib.types.str;
default = null;
default = config.skyg.internalNetworkingMap.appNetwork.ipRange;
description = "IPv4 range for dynamic address allocation (--ip-range).";
};