3 files changed, 59 insertions, 17 deletions
diff --git a/machines/corsac/default.nix b/machines/corsac/default.nix
index d030b31..c3d7d85 100644
--- a/machines/corsac/default.nix
+++ b/machines/corsac/default.nix
@@ -7,7 +7,6 @@
     ./hardware.nix
     ./devices.nix
 
-    ../../modules/www
     ../../modules/dns.nix
     ../../modules/ddns.nix
     ../../modules/nfs.nix
@@ -18,9 +17,24 @@
     ../../services/transmission.nix
   ];
 
-  foundation.monitoring = {
-    client.enable = true;
-    services = [ "base" "dns" "home" "jellyfin" "immich" ];
+  foundation = {
+    www = {
+      enable = true;
+
+      public = true;
+      tailnet = true;
+    };
+
+    monitoring = {
+      client.enable = true;
+      services = [
+        "base"
+        "dns"
+        "home"
+        "jellyfin"
+        "immich"
+      ];
+    };
   };
 
   system.stateVersion = "24.05";
diff --git a/machines/lapin/default.nix b/machines/lapin/default.nix
index 4940df6..07114e5 100644
--- a/machines/lapin/default.nix
+++ b/machines/lapin/default.nix
@@ -1,4 +1,4 @@
-{ me, config, ... }:
+{ ... }:
 
 {
   imports = [
@@ -7,16 +7,28 @@
     ./hardware.nix
     ./devices.nix
 
-    ../../modules/www
-
     ../../services/conduwuit.nix
     ../../services/pds.nix
     ../../services/akkoma
   ];
 
-  foundation.monitoring = {
-    client.enable = true;
-    services = [ "base" "akkoma" "pds" "conduwuit" ];
+  foundation = {
+    www = {
+      enable = true;
+
+      public = true;
+      tailnet = true;
+    };
+
+    monitoring = {
+      client.enable = true;
+      services = [
+        "base"
+        "akkoma"
+        "pds"
+        "conduwuit"
+      ];
+    };
   };
 
   system.stateVersion = "23.05";
diff --git a/machines/renard/default.nix b/machines/renard/default.nix
index f56c2f5..aed4b2e 100644
--- a/machines/renard/default.nix
+++ b/machines/renard/default.nix
@@ -7,7 +7,6 @@
     ./hardware.nix
     ./devices.nix
 
-    ../../modules/www
     ../../modules/binary-cache.nix
     ../../modules/git.nix
     ../../modules/syncthing.nix
@@ -19,15 +18,32 @@
     ../../services/irc
   ];
 
-  foundation.monitoring = {
-    server = {
+  foundation = {
+    www = {
       enable = true;
-      hosts = map (m: {
-        inherit (m) name; inherit (m.tailscale) ip;
-      }) machines;
+
+      public = true;
+      tailnet = true;
     };
 
-    services = [ "base" "tailnet" "cache" "git" "mel" "shorest" ];
+    monitoring = {
+      server = {
+        enable = true;
+        hosts = map (m: {
+          inherit (m) name;
+          inherit (m.tailscale) ip;
+        }) machines;
+      };
+
+      services = [
+        "base"
+        "tailnet"
+        "cache"
+        "git"
+        "mel"
+        "shorest"
+      ];
+    };
   };
 
   services.nginx.virtualHosts = {