diff --git a/hosts/fw.cloonar.com/modules/gitea.nix b/hosts/fw.cloonar.com/modules/gitea.nix index 629fd6f..8b0db82 100644 --- a/hosts/fw.cloonar.com/modules/gitea.nix +++ b/hosts/fw.cloonar.com/modules/gitea.nix @@ -100,7 +100,9 @@ in containers.gitea = { autoStart = true; ephemeral = true; - macvlans = [ "vserver" ]; + # macvlans = [ "vserver" ]; + hostBridge = "server"; + localAddress = "10.42.97.1/24"; bindMounts = { "/var/lib/gitea" = { hostPath = "/var/lib/gitea/"; @@ -116,7 +118,7 @@ in config = { lib, config, pkgs, ... }: { networking = { hostName = "fw"; - interfaces.mv-vserver = { + interfaces.eth0 = { useDHCP = true; ipv4.addresses = [ { address = "10.42.97.2"; prefixLength = 24; } ]; }; diff --git a/hosts/fw.cloonar.com/modules/networking.nix b/hosts/fw.cloonar.com/modules/networking.nix index fad588a..4b6b08e 100644 --- a/hosts/fw.cloonar.com/modules/networking.nix +++ b/hosts/fw.cloonar.com/modules/networking.nix @@ -47,9 +47,14 @@ interface = "enp5s0"; }; }; - macvlans.server = { - interface = "vserver"; - mode = "bridge"; + # macvlans.server = { + # interface = "vserver"; + # mode = "bridge"; + # }; + bridges = { + server = { + interfaces = [ "vserver" ]; + }; }; interfaces = {