diff --git a/hosts/fw.cloonar.com/modules/omada.nix b/hosts/fw.cloonar.com/modules/omada.nix index 4fd6173..5a89f89 100644 --- a/hosts/fw.cloonar.com/modules/omada.nix +++ b/hosts/fw.cloonar.com/modules/omada.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { users.users.omada = { isSystemUser = true; group = "omada"; @@ -18,6 +17,9 @@ "/var/lib/omada/data:/opt/tplink/EAPController/data" "/var/lib/omada/logs:/opt/tplink/EAPController/logs" ]; + extraOptions = [ + "--network=servernet" + ]; }; }; }; diff --git a/hosts/fw.cloonar.com/modules/podman.nix b/hosts/fw.cloonar.com/modules/podman.nix index 238e4ef..40578f0 100644 --- a/hosts/fw.cloonar.com/modules/podman.nix +++ b/hosts/fw.cloonar.com/modules/podman.nix @@ -3,21 +3,26 @@ podman = { enable = true; dockerCompat = true; - defaultNetwork.settings = { - cniVersion = "0.4.0"; - plugins = [ - { - type = "macvlan"; - master = "server"; - pam = { - type = "dhcp"; - }; - } - ]; - }; + defaultNetwork.settings.dns_enabled = true; }; }; + environment.etc."containers/networks/podman.json" = { + source = pkgs.format.json.generate "podman.json" ({ + cniVersion = "0.4.0"; + name = "servernet"; + plugins = [ + { + type = "macvlan"; + master = "server"; + pam = { + type = "dhcp"; + }; + } + ]; + }); + }; + systemd.sockets."io.podman.dhcp" = { description = "DHCP Client for CNI";