5 files changed, 0 insertions, 141 deletions
diff --git a/system/secrets/default.nix b/system/secrets/default.nix
index 565a774..a8071eb 100644
--- a/system/secrets/default.nix
+++ b/system/secrets/default.nix
@@ -7,12 +7,6 @@
         owner = "root";
         group = "root";
       };
-      mastodonMail = {
-        file = ./mastodon/mail.age;
-        mode = "700";
-        owner = "mastodon";
-        group = "mastodon";
-      };
       matrix-synapse_registration_shared_secret = {
         file = ./matrix-synapse/passwd.age;
         mode = "700";
diff --git a/system/secrets/mastodon/mail.age b/system/secrets/mastodon/mail.age
deleted file mode 100644
index ea50b17..0000000
--- a/system/secrets/mastodon/mail.age
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqZWlGM1MvTUN0U0pndkli
-RlJFZGtqTStzVzJpeFFRQ3BvandlWHJId2ljCkVPOGtaYThJdW4yeUl6Qnd2aUpi
-cEpIT2NraTlDcmdla0lSeWZ6VFdoaVUKLT4gWDI1NTE5IEwrdjVRYjlyakVnNGZ5
-UXVrU0tKT2NaOHdpYmE2L1E3TlFwWFZ2b2NuM2cKRnl5RFg1WWF6ejNlbGt6SVJC
-eXdtUE5LRzNlNHhHTGJsbkpwVWwrVWFXZwotPiBzc2gtZWQyNTUxOSBPRDhUNGcg
-ak9GNHhxOFJaY0pVTHphcVR6dGtReUYyUElrUDVCZVpjbnZiSFpBbjZ4MAo5R3E0
-WWNqWTU2TkFoN1I0OXBjS2QwWWxqRHNCemRvUHRJYkJXMEw0eFg0Ci0+IGlwey1n
-cmVhc2UgWkAhXU8xc0cKME4rTDFZemNxZnBCNU0yRFlNbWJCdnk3TFpsdGp0WXpD
-RWRPNG5zZjlqNnBnVDZrQythV3drZUxScUt5V1J3ZgpwRWt5REVHTy9pL3Bvd0VL
-RUQyOU5iWFNZa3NGUjJQakRIV2QKLS0tIElJSFdpOUppcHpJM3hWbSt4NWtob254
-TVBZNTZCMS9VRHFEUVZoMFowSncKrgSHBWQCSpoirkhv62BYGg7dvvDzkkduUqVY
-xXJU948PAe0skP2mPf5ba/W6K5lZCFrQo+AWQycBDNrLYI2/ZgXElfqqJKkpKbt3
-5tIpDZtld/q6DvmG5gp7vP541mHR8g==
------END AGE ENCRYPTED FILE-----
diff --git a/system/services/default.nix b/system/services/default.nix
index dfce3be..967bad0 100644
--- a/system/services/default.nix
+++ b/system/services/default.nix
@@ -2,7 +2,6 @@
   imports = [
     ./invidious
     ./mail
-    ./mastodon
     ./matrix
     ./minecraft
     ./restic
diff --git a/system/services/mastodon/default.nix b/system/services/mastodon/default.nix
deleted file mode 100644
index 15b8609..0000000
--- a/system/services/mastodon/default.nix
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}: let
-  emailAddress = "mastodon@vhack.eu";
-  applyPatches = pkg:
-    pkg.overrideAttrs (attrs: {
-      patches = (attrs.patches or []) ++ [./patches/0001-feat-treewide-Increase-character-limit-to-5000-in-me.patch];
-    });
-in {
-  vhack.persist.directories = [
-    {
-      directory = "/var/lib/mastodon";
-      user = "mastodon";
-      group = "mastodon";
-      mode = "0700";
-    }
-  ];
-
-  services.mastodon = {
-    enable = true;
-
-    package = applyPatches pkgs.mastodon;
-
-    # Unstable Mastodon package, used if
-    # security updates aren't backported.
-    #package = applyPatches pkgs-unstable.mastodon;
-
-    localDomain = "vhack.eu";
-    smtp = {
-      authenticate = true;
-      createLocally = false;
-      fromAddress = emailAddress;
-      user = emailAddress;
-      host = "server1.vhack.eu";
-      passwordFile = config.age.secrets.mastodonMail.path;
-    };
-    streamingProcesses = 5; # Number of Cores - 1
-    extraConfig = {
-      WEB_DOMAIN = "mastodon.vhack.eu";
-      EMAIL_DOMAIN_ALLOWLIST = "vhack.eu|sils.li";
-    };
-  };
-
-  services.nginx = {
-    enable = true;
-    recommendedProxySettings = true; # required for redirections to work
-    virtualHosts = {
-      ${config.services.mastodon.extraConfig.WEB_DOMAIN} = {
-        root = "${config.services.mastodon.package}/public/";
-        # mastodon only supports https, but you can override this if you offload tls elsewhere.
-        forceSSL = true;
-        enableACME = true;
-
-        locations = {
-          "/system/".alias = "/var/lib/mastodon/public-system/";
-          "/".tryFiles = "$uri @proxy";
-          "@proxy" = {
-            proxyPass = "http://unix:/run/mastodon-web/web.socket";
-            proxyWebsockets = true;
-          };
-          "/api/v1/streaming/" = {
-            proxyPass = "http://unix:/run/mastodon-streaming/streaming.socket";
-            proxyWebsockets = true;
-          };
-        };
-      };
-
-      "vhack.eu" = {
-        locations."/.well-known/webfinger".return = "301 https://${config.services.mastodon.extraConfig.WEB_DOMAIN}$request_uri";
-      };
-    };
-  };
-
-  users.groups.${config.services.mastodon.group}.members = [
-    config.services.nginx.user
-  ];
-}
diff --git a/system/services/mastodon/patches/0001-feat-treewide-Increase-character-limit-to-5000-in-me.patch b/system/services/mastodon/patches/0001-feat-treewide-Increase-character-limit-to-5000-in-me.patch
deleted file mode 100644
index 35dc809..0000000
--- a/system/services/mastodon/patches/0001-feat-treewide-Increase-character-limit-to-5000-in-me.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From ab67426c53d343eee349de501767ecbbf5d211ad Mon Sep 17 00:00:00 2001
-From: Benedikt Peetz <benedikt.peetz@b-peetz.de>
-Date: Sat, 21 Dec 2024 20:07:11 +0100
-Subject: [PATCH] feat(treewide): Increase character limit to 5000 in messages
-
-The default of 500 was just not enough.
----
- .../features/compose/containers/compose_form_container.js       | 2 +-
- app/validators/status_length_validator.rb                       | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/app/javascript/mastodon/features/compose/containers/compose_form_container.js b/app/javascript/mastodon/features/compose/containers/compose_form_container.js
-index bda2edba6..76ac65bf3 100644
---- a/app/javascript/mastodon/features/compose/containers/compose_form_container.js
-+++ b/app/javascript/mastodon/features/compose/containers/compose_form_container.js
-@@ -28,7 +28,7 @@ const mapStateToProps = state => ({
-   anyMedia: state.getIn(['compose', 'media_attachments']).size > 0,
-   isInReply: state.getIn(['compose', 'in_reply_to']) !== null,
-   lang: state.getIn(['compose', 'language']),
--  maxChars: state.getIn(['server', 'server', 'configuration', 'statuses', 'max_characters'], 500),
-+  maxChars: state.getIn(['server', 'server', 'configuration', 'statuses', 'max_characters'], 5000),
- });
- 
- const mapDispatchToProps = (dispatch) => ({
-diff --git a/app/validators/status_length_validator.rb b/app/validators/status_length_validator.rb
-index dc841ded3..9cb1ec94b 100644
---- a/app/validators/status_length_validator.rb
-+++ b/app/validators/status_length_validator.rb
-@@ -1,7 +1,7 @@
- # frozen_string_literal: true
- 
- class StatusLengthValidator < ActiveModel::Validator
--  MAX_CHARS = 500
-+  MAX_CHARS = 5000
-   URL_PLACEHOLDER_CHARS = 23
-   URL_PLACEHOLDER = 'x' * 23
- 
--- 
-2.47.0
-