From 12c1ae47aa6c2422ee98aabbed3da6c717de5697 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Fri, 17 Jan 2025 17:01:53 +0100
Subject: [PATCH] run mastadon in main

---
 systems/hetzner/default.nix | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/systems/hetzner/default.nix b/systems/hetzner/default.nix
index e7d214d..94321d6 100644
--- a/systems/hetzner/default.nix
+++ b/systems/hetzner/default.nix
@@ -95,22 +95,19 @@ in
     chrootlocalUser = true;
   };
 
+  services.mastodon = {
+    enable = true;
+    streamingProcesses = (lib.elemAt config.facter.report.hardware.cpu 0).cores - 1;
+    localDomain = "nyan.social";
+    smtp.fromAddress = "mastodon@nyan.social";
+    configureNginx = true;
+  };
+
   users.users.backupftp = {
     isNormalUser = true;
     initialPassword = "backupPassword";
   };
 
-  services.nginx = {
-    virtualHosts."${config.containers.nyan.config.services.mastodon.localDomain}" = {
-      forceSSL = true;
-      enableACME = true;
-      locations."/" = {
-        proxyPass = "http://192.168.100.5";
-        proxyWebsockets = true;
-      };
-    };
-  };
-
   containers = {
     nyan = {
       privateNetwork = true;
@@ -118,13 +115,6 @@ in
       localAddress = "192.168.100.5/24";
       config = {
         system.stateVersion = "25.05";
-        services.mastodon = {
-          enable = true;
-          streamingProcesses = (lib.elemAt config.facter.report.hardware.cpu 0).cores - 1;
-          localDomain = "nyan.social";
-          smtp.fromAddress = "mastodon@nyan.social";
-          configureNginx = true;
-        };
         services.nginx = {
           virtualHosts."${config.containers.nyan.config.services.mastodon.localDomain}" = {
             forceSSL = false;