diff --git a/hosts/fw.cloonar.com/modules/firewall.nix b/hosts/fw.cloonar.com/modules/firewall.nix index b1bef77..6c46516 100644 --- a/hosts/fw.cloonar.com/modules/firewall.nix +++ b/hosts/fw.cloonar.com/modules/firewall.nix @@ -70,7 +70,7 @@ # Allow networks to access the dns and dhcp iifname { "lan", - "ve-gitea", + "vb-gitea", "podman0", "infrastructure", "wg_cloonar", @@ -80,7 +80,7 @@ iifname { "lan", "podman0", - "ve-gitea", + "vb-gitea", "infrastructure", "wg_cloonar", "smart", @@ -111,14 +111,14 @@ # lan and vpn to any # TODO: disable wan when finished - iifname { "wan", "lan", "ve-gitea", "podman0", "wg_cloonar" } oifname { "lan", "ve-gitea", "podman0", "infrastructure", "multimedia", "smart", "wrwks", "wg_cloonar", "wg_epicenter", "wg_ghetto_at" } counter accept - iifname { "infrastructure" } oifname { "podman0", "ve-omada" } counter accept + iifname { "wan", "lan", "vb-gitea", "podman0", "wg_cloonar" } oifname { "lan", "vb-gitea", "podman0", "infrastructure", "multimedia", "smart", "wrwks", "wg_cloonar", "wg_epicenter", "wg_ghetto_at" } counter accept + iifname { "infrastructure" } oifname { "podman0", "vb-omada" } counter accept # Allow trusted network WAN access iifname { "lan", "infrastructure", - "ve-gitea", + "vb-gitea", "podman0", "multimedia", "smart", diff --git a/hosts/fw.cloonar.com/modules/gitea.nix b/hosts/fw.cloonar.com/modules/gitea.nix index f1b9fa4..5f05ddf 100644 --- a/hosts/fw.cloonar.com/modules/gitea.nix +++ b/hosts/fw.cloonar.com/modules/gitea.nix @@ -103,7 +103,6 @@ in # macvlans = [ "vserver" ]; privateNetwork = true; hostBridge = "server"; - hostAddress = "10.42.97.1"; localAddress = "10.42.97.2"; bindMounts = { "/var/lib/gitea" = {