From f2fe064f723dff871d4887f9bb3e9c72b2df8460 Mon Sep 17 00:00:00 2001
From: Jake Hillion <jake@hillion.co.uk>
Date: Sun, 7 Apr 2024 19:06:46 +0100
Subject: [PATCH] mastodon: stop running

---
 modules/locations.nix                 | 2 +-
 modules/services/mastodon/default.nix | 2 ++
 modules/www/global.nix                | 2 --
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/locations.nix b/modules/locations.nix
index f6916c5..65819df 100644
--- a/modules/locations.nix
+++ b/modules/locations.nix
@@ -16,7 +16,7 @@ in
           downloads = "tywin.storage.ts.hillion.co.uk";
           gitea = "jorah.cx.ts.hillion.co.uk";
           homeassistant = "microserver.home.ts.hillion.co.uk";
-          mastodon = "vm.strangervm.ts.hillion.co.uk";
+          mastodon = "";
           matrix = "jorah.cx.ts.hillion.co.uk";
           unifi = "jorah.cx.ts.hillion.co.uk";
         };
diff --git a/modules/services/mastodon/default.nix b/modules/services/mastodon/default.nix
index e70b831..47a03a4 100644
--- a/modules/services/mastodon/default.nix
+++ b/modules/services/mastodon/default.nix
@@ -32,6 +32,8 @@ in
       };
     };
 
+    users.users.caddy.extraGroups = [ "mastodon" ];
+
     services = {
       mastodon = {
         enable = true;
diff --git a/modules/www/global.nix b/modules/www/global.nix
index a579572..2e7c082 100644
--- a/modules/www/global.nix
+++ b/modules/www/global.nix
@@ -12,8 +12,6 @@ in
   config = lib.mkIf cfg.enable {
     custom.www.www-repo.enable = true;
 
-    users.users.caddy.extraGroups = [ "mastodon" ];
-
     services.caddy = {
       enable = true;