From 18747fe129504d87aaeda1f01af8a484c41d39b2 Mon Sep 17 00:00:00 2001 From: Dominik Polakovics Date: Sun, 3 Dec 2023 22:07:28 +0100 Subject: [PATCH] remove podman ip for testing --- hosts/fw.cloonar.com/configuration.nix | 2 +- hosts/fw.cloonar.com/modules/podman.nix | 62 +------------------------ 2 files changed, 2 insertions(+), 62 deletions(-) diff --git a/hosts/fw.cloonar.com/configuration.nix b/hosts/fw.cloonar.com/configuration.nix index b49cd18..7f7e1e3 100644 --- a/hosts/fw.cloonar.com/configuration.nix +++ b/hosts/fw.cloonar.com/configuration.nix @@ -20,7 +20,7 @@ ./modules/openconnect.nix ./modules/wireguard.nix ./modules/podman.nix - ./modules/omada.nix + # ./modules/omada.nix # git ./modules/gitea.nix diff --git a/hosts/fw.cloonar.com/modules/podman.nix b/hosts/fw.cloonar.com/modules/podman.nix index 7154097..c9698d9 100644 --- a/hosts/fw.cloonar.com/modules/podman.nix +++ b/hosts/fw.cloonar.com/modules/podman.nix @@ -7,68 +7,8 @@ in { enable = true; dockerCompat = true; defaultNetwork.settings = { - # dns_enabled = true; - subnets = [{ gateway = "10.42.97.1"; subnet = "10.42.97.0/24"; }]; + # subnets = [{ gateway = "10.42.97.1"; subnet = "10.42.97.0/24"; }]; }; - # defaultNetwork.settings = { - # driver = "macvlan"; - # network_interface = "server"; - # ipv6_enabled = false; - # internal = false; - # dns_enabled = false; - # subnets = [{ - # gateway = "10.42.97.1"; - # subnet = "10.42.97.0/24"; - # lease_range = { - # start_ip = "10.42.97.193"; - # end_ip = "10.42.97.223"; - # }; - # }]; - # }; }; }; - - # networking = { - # macvlans = { - # "server-shim" = { - # interface = "server"; - # mode = "bridge"; - # }; - # }; - # interfaces = { - # "server-shim" = { - # ipv4.addresses = [{ - # address = "10.42.97.223"; - # prefixLength = 24; - # }]; - # ipv4.routes = [{ - # address = "10.42.97.192"; - # prefixLength = 27; - # }]; - # }; - # }; - # }; - - # systemd.sockets."netavark-dhcp-proxy" = { - # description = "Netavark DHCP proxy socket"; - # socketConfig = { - # ListenStream = "%t/podman/nv-proxy.sock"; - # SocketMode = 0660; - # }; - # wantedBy = [ "sockets.target" ]; - # }; - # - # systemd.services."netavark-dhcp-proxy" = { - # description = "Netavark DHCP proxy service"; - # after = [ "netavark-dhcp-proxy.socket" ]; - # requires = [ "netavark-dhcp-proxy.socket" ]; - # wantedBy = [ "multi-user.target" "netavark-dhcp-proxy.socket" ]; - # path = [ pkgs.netavark ]; - # startLimitIntervalSec = 0; - # - # serviceConfig = { - # Type = "exec"; - # ExecStart= "${pkgs.netavark}/bin/netavark dhcp-proxy -a 30"; - # }; - # }; }