diff --git a/hosts/server1/configuration.nix b/hosts/server1/configuration.nix index 8eb521d..b350430 100644 --- a/hosts/server1/configuration.nix +++ b/hosts/server1/configuration.nix @@ -24,12 +24,10 @@ nixos = { httpd = { enable = true; - bridge = "br0"; ip = "192.168.1.201/24"; }; unbound = { enable = true; - bridge = "br0"; ip = "192.168.1.202/24"; }; }; diff --git a/modules/nix/containers/nixos/httpd.nix b/modules/nix/containers/nixos/httpd.nix index 2f40075..dd5bb8e 100644 --- a/modules/nix/containers/nixos/httpd.nix +++ b/modules/nix/containers/nixos/httpd.nix @@ -11,10 +11,6 @@ in default = false; description = "httpd nixos ct"; }; - bridge = mkOption { - type = types.str; - description = "the bridge to use e.g. (br0)"; - }; ip = mkOption { type = types.str; description = "ip addr e.g. (192.168.1.20)"; @@ -25,7 +21,7 @@ in containers.httpd = { autoStart = true; privateNetwork = true; - hostBridge = cfg.bridge; + hostBridge = net.bridge; localAddress = cfg.ip; config = { ... }: { system.stateVersion = "25.11"; diff --git a/modules/nix/containers/nixos/traefik.nix b/modules/nix/containers/nixos/traefik.nix index 2aa0a89..4f33dc7 100644 --- a/modules/nix/containers/nixos/traefik.nix +++ b/modules/nix/containers/nixos/traefik.nix @@ -11,10 +11,6 @@ in default = false; description = "traefik nixos ct"; }; - bridge = mkOption { - type = types.str; - description = "the bridge to use e.g. (br0)"; - }; ip = mkOption { type = types.str; description = "ip addr e.g. (192.168.1.20)"; diff --git a/modules/nix/containers/nixos/unbound.nix b/modules/nix/containers/nixos/unbound.nix index 3040ff2..3f5483b 100644 --- a/modules/nix/containers/nixos/unbound.nix +++ b/modules/nix/containers/nixos/unbound.nix @@ -11,10 +11,6 @@ in default = false; description = "unbound nixos ct"; }; - bridge = mkOption { - type = types.str; - description = "the bridge to use e.g. (br0)"; - }; ip = mkOption { type = types.str; description = "ip addr e.g. (192.168.1.20)"; @@ -25,7 +21,7 @@ in containers.unbound = { autoStart = true; privateNetwork = true; - hostBridge = cfg.bridge; + hostBridge = net.bridge; localAddress = cfg.ip; config = { ... }: { system.stateVersion = "25.11";