diff --git a/hosts/fw.cloonar.com/configuration.nix b/hosts/fw.cloonar.com/configuration.nix index 6691542..7189949 100644 --- a/hosts/fw.cloonar.com/configuration.nix +++ b/hosts/fw.cloonar.com/configuration.nix @@ -19,8 +19,8 @@ ./modules/avahi.nix ./modules/openconnect.nix ./modules/wireguard.nix - # ./modules/podman.nix - # ./modules/omada.nix + ./modules/podman.nix + ./modules/omada.nix # git ./modules/gitea.nix @@ -65,7 +65,6 @@ ethtool # manage NIC settings (offload, NIC feeatures, ...) tcpdump # view network traffic conntrack-tools # view network connection states - omada ]; nix.gc = { diff --git a/hosts/fw.cloonar.com/modules/omada.nix b/hosts/fw.cloonar.com/modules/omada.nix index 99c07d4..792410f 100644 --- a/hosts/fw.cloonar.com/modules/omada.nix +++ b/hosts/fw.cloonar.com/modules/omada.nix @@ -24,37 +24,37 @@ }; }; - security.acme.certs."${domain}" = { - domain = "${domain}"; - }; + # security.acme.certs."${domain}" = { + # domain = "${domain}"; + # }; - containers.omada = { - autoStart = true; - ephemeral = true; - macvlans = [ "vserver" ]; - bindMounts = { - "/var/lib/gitea" = { - hostPath = "/var/lib/gitea/"; - isReadOnly = false; - }; - }; - bindMounts = { - "/var/lib/acme/gitea/" = { - hostPath = "${config.security.acme.certs.${domain}.directory}"; - isReadOnly = true; - }; - }; - config = { lib, config, pkgs, ... }: { - networking = { - hostName = "gitea"; - interfaces.mv-vserver = { - useDHCP = true; - }; - firewall = { - enable = true; - allowedTCPPorts = [ 22 80 443 ]; - }; - }; - }; - }; + # containers.omada = { + # autoStart = true; + # ephemeral = true; + # macvlans = [ "vserver" ]; + # bindMounts = { + # "/var/lib/gitea" = { + # hostPath = "/var/lib/gitea/"; + # isReadOnly = false; + # }; + # }; + # bindMounts = { + # "/var/lib/acme/gitea/" = { + # hostPath = "${config.security.acme.certs.${domain}.directory}"; + # isReadOnly = true; + # }; + # }; + # config = { lib, config, pkgs, ... }: { + # networking = { + # hostName = "gitea"; + # interfaces.mv-vserver = { + # useDHCP = true; + # }; + # firewall = { + # enable = true; + # allowedTCPPorts = [ 22 80 443 ]; + # }; + # }; + # }; + # }; } diff --git a/hosts/fw.cloonar.com/modules/podman.nix b/hosts/fw.cloonar.com/modules/podman.nix index c9698d9..54ece71 100644 --- a/hosts/fw.cloonar.com/modules/podman.nix +++ b/hosts/fw.cloonar.com/modules/podman.nix @@ -7,7 +7,11 @@ in { enable = true; dockerCompat = true; defaultNetwork.settings = { - # subnets = [{ gateway = "10.42.97.1"; subnet = "10.42.97.0/24"; }]; + driver = "macvlan"; + master = "vserver"; + ipam_options = { + driver = "dhcp"; + } }; }; };