From c71256d61a9a88d09e15dc2bd7fd25a111ac0163 Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Fri, 20 Dec 2024 01:20:49 -0600
Subject: [PATCH] feat: caddy test

---
 config/instances/config/mastodon.nix        | 10 ++++------
 nixos/modules/services/mastodon/default.nix |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/config/instances/config/mastodon.nix b/config/instances/config/mastodon.nix
index f7276a2..71937a3 100755
--- a/config/instances/config/mastodon.nix
+++ b/config/instances/config/mastodon.nix
@@ -1,14 +1,13 @@
 {instancesFunctions}: let
-  inherit (instancesFunctions) domain3 servicePath sslPath sopsPath;
+  inherit (instancesFunctions) domain1 servicePath sslPath sopsPath;
 
   mastodonLabel = "Mastodon";
   mastodonName = "mastodon";
-  mastodonSubdomain = "social";
 in {
   label = mastodonLabel;
   name = mastodonName;
   email = {
-    address0 = "nick@${domain3}";
+    address0 = "thenutrivore@${domain1}";
   };
   sops = {
     path0 = "${sopsPath}/${mastodonName}";
@@ -18,9 +17,8 @@ in {
     path1 = "";
     path2 = "";
   };
-  subdomain = mastodonSubdomain;
   ssl = {
-    cert = "${sslPath}/${mastodonSubdomain}.${domain3}/fullchain.pem";
-    key = "${sslPath}/${mastodonSubdomain}.${domain3}/key.pem";
+    cert = "${sslPath}/${domain1}/fullchain.pem";
+    key = "${sslPath}/${domain1}/key.pem";
   };
 }
diff --git a/nixos/modules/services/mastodon/default.nix b/nixos/modules/services/mastodon/default.nix
index 6693a27..b54c74e 100755
--- a/nixos/modules/services/mastodon/default.nix
+++ b/nixos/modules/services/mastodon/default.nix
@@ -8,7 +8,7 @@
   inherit (flake.config.machines.devices) server;
   inherit (flake.config.services.instances) mastodon web;
   service = mastodon;
-  host = "${service.subdomain}.${web.domains.url3}";
+  host = web.domains.url1;
   localhost = web.localhost.address0;
 in {
   # If you need to start fresh for some reason, run these to create the new Admin account: