prep for distrust-mini

2025-11-09 23:58:44 +00:00 · 2025-11-09 23:58:44 +00:00 · f25280a6ec
commit f25280a6ec
parent 376ff22be5
4 changed files with 6 additions and 11 deletions
--- a/services/distrust-mini/default.nix
+++ b/services/distrust-mini/default.nix
@ -1,9 +1,12 @@
 {
  imports = [
+    # Core System
    ../shared

-    # TOR bridge
+    # Non-stateful services
    ./tor.nix
+
+    # Stateful services
    # Status page in diff. data center for redundancy/resilience
    ./uptime-kuma.nix
  ];
--- a/services/distrust/caddy.nix
+++ b/services/distrust/caddy.nix
@ -1,7 +0,0 @@
-{
-  services.caddy = {
-    enable = true;
-  };
-
-  networking.firewall.allowedTCPPorts = [80 443];
-}
--- a/services/distrust/default.nix
+++ b/services/distrust/default.nix
@ -1,9 +1,7 @@
 {
  imports = [
-    ../shared
-
    # Core System
-    ./caddy.nix
+    ../shared

    # Non-stateful services
    ./ipfs.nix
--- a/services/shared/default.nix
+++ b/services/shared/default.nix
@ -1,5 +1,6 @@
 {
  imports = [
    ./borg.nix
+    ./caddy.nix
  ];
 }