diff --git a/hosts/w1/podman.nix b/hosts/w1/podman.nix index ceb5ab8..ad2da52 100644 --- a/hosts/w1/podman.nix +++ b/hosts/w1/podman.nix @@ -1,5 +1,5 @@ -# Auto-generated using compose2nix v0.3.1. -{ pkgs, lib, ... }: +# Auto-generated by compose2nix. +{ pkgs, lib, config, ... }: { # Runtime @@ -7,15 +7,16 @@ enable = true; autoPrune.enable = true; dockerCompat = true; - defaultNetwork.settings = { - # Required for container networking to be able to use names. - dns_enabled = true; - }; }; - # Enable container name DNS for non-default Podman networks. - # https://github.com/NixOS/nixpkgs/issues/226365 - networking.firewall.interfaces."podman+".allowedUDPPorts = [ 53 ]; + # Enable container name DNS for all Podman networks. + networking.firewall.interfaces = + let + matchAll = if !config.networking.nftables.enable then "podman+" else "podman*"; + in + { + "${matchAll}".allowedUDPPorts = [ 53 ]; + }; virtualisation.oci-containers.backend = "podman"; @@ -47,16 +48,6 @@ requires = [ "podman-network-websites_default.service" ]; partOf = [ "podman-compose-websites-root.target" ]; wantedBy = [ "podman-compose-websites-root.target" ]; - unitConfig.RequiresMountsFor = [ - "/home/don/podman/caddy/Caddyfile" - "/home/don/podman/caddy/config" - "/home/don/podman/caddy/data" - "/home/don/www/p365" - "/home/don/www/travel.donaldharper.com" - "/home/don/www/www.donaldharper.com" - "/home/don/www/www.donharper.org" - "/home/don/www/www.duckland.org" - ]; }; # Networks