6 files changed, 17 insertions, 14 deletions
diff --git a/modules/server/networking/caddy.nix b/modules/server/networking/caddy.nix
index 57481c4..809d5ef 100644
--- a/modules/server/networking/caddy.nix
+++ b/modules/server/networking/caddy.nix
@@ -1,4 +1,9 @@
 {
+  networking.firewall.allowedTCPPorts = [
+    80
+    443
+  ];
+
   services.caddy = {
     enable = true;
 
diff --git a/modules/server/networking/default.nix b/modules/server/networking/default.nix
index 386e961..f542304 100644
--- a/modules/server/networking/default.nix
+++ b/modules/server/networking/default.nix
@@ -6,19 +6,6 @@
 
   networking = {
     domain = "";
-
-    firewall = {
-      allowedUDPPorts = [ 53 ];
-
-      allowedTCPPorts = [
-        70
-        79
-        80
-        443
-        1965
-        5673
-        6650
-      ];
-    };
+    firewall.allowedUDPPorts = [ 53 ];
   };
 }
diff --git a/modules/server/virtualisation/containers/gigi.nix b/modules/server/virtualisation/containers/gigi.nix
index 89803d3..25f5458 100644
--- a/modules/server/virtualisation/containers/gigi.nix
+++ b/modules/server/virtualisation/containers/gigi.nix
@@ -1,5 +1,7 @@
 { config, ... }:
 {
+  networking.firewall.allowedTCPPorts = [ 79 ];
+
   virtualisation.oci-containers.containers.gigi = {
     inherit (config.modules.containers) extraOptions;
 
diff --git a/modules/server/virtualisation/containers/locus.nix b/modules/server/virtualisation/containers/locus.nix
index 3872347..fa88016 100644
--- a/modules/server/virtualisation/containers/locus.nix
+++ b/modules/server/virtualisation/containers/locus.nix
@@ -1,5 +1,7 @@
 { config, ... }:
 {
+  networking.firewall.allowedTCPPorts = [ 1965 ];
+
   virtualisation.oci-containers.containers.locus = {
     inherit (config.modules.containers) extraOptions;
 
diff --git a/modules/server/virtualisation/containers/momoka.nix b/modules/server/virtualisation/containers/momoka.nix
index f73242f..e1c869d 100644
--- a/modules/server/virtualisation/containers/momoka.nix
+++ b/modules/server/virtualisation/containers/momoka.nix
@@ -1,5 +1,7 @@
 { config, ... }:
 {
+  networking.firewall.allowedTCPPorts = [ 70 ];
+
   virtualisation.oci-containers.containers.momoka = {
     inherit (config.modules.containers) extraOptions;
 
diff --git a/modules/server/virtualisation/containers/whirl.nix b/modules/server/virtualisation/containers/whirl.nix
index 4d89bdb..f910bf9 100644
--- a/modules/server/virtualisation/containers/whirl.nix
+++ b/modules/server/virtualisation/containers/whirl.nix
@@ -1,5 +1,10 @@
 { config, ... }:
 {
+  networking.firewall.allowedTCPPorts = [
+    5673
+    6650
+  ];
+
   virtualisation.oci-containers.containers.whirl = {
     inherit (config.modules.containers) extraOptions;