From 4be2f40abe26d7c3f4a9a47f60ce4f46268fd552 Mon Sep 17 00:00:00 2001
From: Tom Hubrecht <tom@hubrecht.ovh>
Date: Sun, 1 Oct 2023 22:55:05 +0200
Subject: [PATCH] feat(dgn-web): Enable module on nodes serving web content

Also remove the firewall config as it is now centralized.
---
 machines/compute01/_configuration.nix | 1 +
 machines/compute01/nextcloud.nix      | 2 --
 machines/storage01/_configuration.nix | 1 +
 machines/storage01/forgejo.nix        | 2 --
 machines/web01/_configuration.nix     | 1 +
 machines/web01/plausible.nix          | 4 ----
 6 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/machines/compute01/_configuration.nix b/machines/compute01/_configuration.nix
index 9b19f69..87cf421 100644
--- a/machines/compute01/_configuration.nix
+++ b/machines/compute01/_configuration.nix
@@ -9,6 +9,7 @@ let
   # List of modules to enable
   enabledModules = [
     "dgn-dns"
+    "dgn-web"
   ];
 
   # List of services to enable
diff --git a/machines/compute01/nextcloud.nix b/machines/compute01/nextcloud.nix
index 95d3f97..f438b78 100644
--- a/machines/compute01/nextcloud.nix
+++ b/machines/compute01/nextcloud.nix
@@ -75,6 +75,4 @@ in {
     (setDefault { owner = "nextcloud"; }
       (builtins.filter (lib.hasPrefix "nextcloud-") config.dgn-secrets.names))
   ];
-
-  networking.firewall.allowedTCPPorts = [ 80 443 ];
 }
diff --git a/machines/storage01/_configuration.nix b/machines/storage01/_configuration.nix
index 648505a..464cc65 100644
--- a/machines/storage01/_configuration.nix
+++ b/machines/storage01/_configuration.nix
@@ -8,6 +8,7 @@ let
 
   # List of modules to enable
   enabledModules = [
+    "dgn-web"
   ];
 
   # List of services to enable
diff --git a/machines/storage01/forgejo.nix b/machines/storage01/forgejo.nix
index e06cb0b..deaba9d 100644
--- a/machines/storage01/forgejo.nix
+++ b/machines/storage01/forgejo.nix
@@ -94,6 +94,4 @@ in {
     (setDefault { owner = "git"; }
       (builtins.filter (lib.hasPrefix "forgejo-") config.dgn-secrets.names))
   ];
-
-  networking.firewall.allowedTCPPorts = [ 80 443 ];
 }
diff --git a/machines/web01/_configuration.nix b/machines/web01/_configuration.nix
index 8b38dd5..3cb864c 100644
--- a/machines/web01/_configuration.nix
+++ b/machines/web01/_configuration.nix
@@ -8,6 +8,7 @@ let
 
   # List of modules to enable
   enabledModules = [
+    "dgn-web"
   ];
 
   # List of services to enable
diff --git a/machines/web01/plausible.nix b/machines/web01/plausible.nix
index 95263c5..fcb624a 100644
--- a/machines/web01/plausible.nix
+++ b/machines/web01/plausible.nix
@@ -52,8 +52,4 @@ in
       };
     };
   };
-
-  # dgn-secrets.options."_smtp-password-file".owner = "plausible";
-  #
-  networking.firewall.allowedTCPPorts = [ 80 443 ];
 }