From ac22bc1849ffdb1e4c10aeeba64e092da39c6da4 Mon Sep 17 00:00:00 2001
From: Jimbo <jimbo@nixfox.ca>
Date: Mon, 20 Jan 2025 15:59:09 -0500
Subject: [PATCH] Undo a change from a while ago idk I'll find something better
 later

---
 hosts/kitty/default.nix                       |  1 -
 hosts/prophet/default.nix                     |  1 -
 .../server/webserver/acme/default.nix         |  2 +-
 .../server/webserver/ddclient/default.nix     | 22 +++++++++----------
 .../services/server/webserver/default.nix     |  5 -----
 .../server/webserver/nginx/default.nix        |  2 +-
 6 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/hosts/kitty/default.nix b/hosts/kitty/default.nix
index ced2549..4e00377 100644
--- a/hosts/kitty/default.nix
+++ b/hosts/kitty/default.nix
@@ -17,7 +17,6 @@
   system = {
     desktop.enable = false;
     server.enable = true;
-    webserver.enable = true;
     fileserver.enable = true;
     socialserver.enable = true;
     wireless.enable = false;
diff --git a/hosts/prophet/default.nix b/hosts/prophet/default.nix
index bd4465b..287eb20 100644
--- a/hosts/prophet/default.nix
+++ b/hosts/prophet/default.nix
@@ -19,7 +19,6 @@
   system = {
     desktop.enable = false;
     mailserver.enable = true;
-    webserver.enable = true;
     wireless.enable = false;
     wireguard.client.enable = true;
     stateVersion = "24.05";
diff --git a/modules/system/services/server/webserver/acme/default.nix b/modules/system/services/server/webserver/acme/default.nix
index c8d0746..9ff77ad 100644
--- a/modules/system/services/server/webserver/acme/default.nix
+++ b/modules/system/services/server/webserver/acme/default.nix
@@ -1,6 +1,6 @@
 { config, lib, ... }:
 {
-  config = lib.mkIf config.system.webserver.enable {
+  config = lib.mkIf config.services.nginx.enable {
     security.acme = { 
       acceptTerms = true;
       defaults.email = "contact@${config.domains.p2}";
diff --git a/modules/system/services/server/webserver/ddclient/default.nix b/modules/system/services/server/webserver/ddclient/default.nix
index 500124d..117eaa6 100644
--- a/modules/system/services/server/webserver/ddclient/default.nix
+++ b/modules/system/services/server/webserver/ddclient/default.nix
@@ -1,16 +1,14 @@
 { config, lib, pkgs, ... }:
 {
-  config = lib.mkIf config.system.webserver.enable {
-    services.ddclient = {
-      enable = true;
-      protocol = "cloudflare";
-      zone = "${config.domains.p2}";
-      usev6 = "";
-      username = "token";
-      passwordFile = "${pkgs.writeText "cloudflareapikey" config.secrets.flareApiKey}";
-    };
-    environment.persistence."/persist".directories = [
-      "/var/lib/private/ddclient"
-    ];
+  services.ddclient = {
+    enable = config.system.server.enable;
+    protocol = "cloudflare";
+    zone = "${config.domains.p2}";
+    usev6 = "";
+    username = "token";
+    passwordFile = "${pkgs.writeText "cloudflareapikey" config.secrets.flareApiKey}";
   };
+  environment.persistence."/persist".directories = lib.mkIf config.services.ddclient.enable [
+    "/var/lib/private/ddclient"
+  ];
 }
diff --git a/modules/system/services/server/webserver/default.nix b/modules/system/services/server/webserver/default.nix
index 04d72dd..24fc6f2 100644
--- a/modules/system/services/server/webserver/default.nix
+++ b/modules/system/services/server/webserver/default.nix
@@ -1,10 +1,5 @@
 { lib, ... }: 
 {
-  options.system.webserver.enable = lib.mkOption {
-    type = lib.types.bool;
-    default = false;
-  };
-
   imports = [
     ./acme
     ./ddclient
diff --git a/modules/system/services/server/webserver/nginx/default.nix b/modules/system/services/server/webserver/nginx/default.nix
index 398226c..767b576 100644
--- a/modules/system/services/server/webserver/nginx/default.nix
+++ b/modules/system/services/server/webserver/nginx/default.nix
@@ -5,7 +5,7 @@
     ./virtualhosts
   ];
 
-  config = lib.mkIf config.system.webserver.enable {
+  config = lib.mkIf (config.system.server.enable || config.system.mailserver.enable) {
     services.nginx = {
       enable = true;
       recommendedTlsSettings = true;