Smayzy/nix-config
1
1
Fork 0
Code Issues Pull Requests Actions Wiki Activity

replace individual bridge option by common one
All checks were successful
nixos config pipeline / show-flake (push) Successful in 1m6s
Details
nixos config pipeline / deploy (push) Successful in 26s
Details

Browse Source
This commit is contained in:
smayzy 2025-09-01 15:56:47 +02:00
parent 6d70290289
commit fe057f88e5
4 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hosts/server1/configuration.nix
View File

@ -24,12 +24,10 @@
nixos = { nixos = {
httpd = { httpd = {
enable = true; enable = true;
bridge = "br0";
ip = "192.168.1.201/24"; ip = "192.168.1.201/24";
}; };
unbound = { unbound = {
enable = true; enable = true;
bridge = "br0";
ip = "192.168.1.202/24"; ip = "192.168.1.202/24";
}; };
}; };

6
modules/nix/containers/nixos/httpd.nix
View File

@ -11,10 +11,6 @@ in
default = false; default = false;
description = "httpd nixos ct"; description = "httpd nixos ct";
}; };
bridge = mkOption {
type = types.str;
description = "the bridge to use e.g. (br0)";
};
ip = mkOption { ip = mkOption {
type = types.str; type = types.str;
description = "ip addr e.g. (192.168.1.20)"; description = "ip addr e.g. (192.168.1.20)";
@ -25,7 +21,7 @@ in
containers.httpd = { containers.httpd = {
autoStart = true; autoStart = true;
privateNetwork = true; privateNetwork = true;
hostBridge = cfg.bridge; hostBridge = net.bridge;
localAddress = cfg.ip; localAddress = cfg.ip;
config = { ... }: { config = { ... }: {
system.stateVersion = "25.11"; system.stateVersion = "25.11";

4
modules/nix/containers/nixos/traefik.nix
View File

@ -11,10 +11,6 @@ in
default = false; default = false;
description = "traefik nixos ct"; description = "traefik nixos ct";
}; };
bridge = mkOption {
type = types.str;
description = "the bridge to use e.g. (br0)";
};
ip = mkOption { ip = mkOption {
type = types.str; type = types.str;
description = "ip addr e.g. (192.168.1.20)"; description = "ip addr e.g. (192.168.1.20)";

6
modules/nix/containers/nixos/unbound.nix
View File

@ -11,10 +11,6 @@ in
default = false; default = false;
description = "unbound nixos ct"; description = "unbound nixos ct";
}; };
bridge = mkOption {
type = types.str;
description = "the bridge to use e.g. (br0)";
};
ip = mkOption { ip = mkOption {
type = types.str; type = types.str;
description = "ip addr e.g. (192.168.1.20)"; description = "ip addr e.g. (192.168.1.20)";
@ -25,7 +21,7 @@ in
containers.unbound = { containers.unbound = {
autoStart = true; autoStart = true;
privateNetwork = true; privateNetwork = true;
hostBridge = cfg.bridge; hostBridge = net.bridge;
localAddress = cfg.ip; localAddress = cfg.ip;
config = { ... }: { config = { ... }: {
system.stateVersion = "25.11"; system.stateVersion = "25.11";