diff --git a/config/hosts/mastodon/mastodon.nix b/config/hosts/mastodon/mastodon.nix index e5249d8..bae9b17 100644 --- a/config/hosts/mastodon/mastodon.nix +++ b/config/hosts/mastodon/mastodon.nix @@ -2,28 +2,28 @@ let tangerineUI = pkgs.fetchgit { url = "https://github.com/nileane/TangerineUI-for-Mastodon.git"; - rev = "v2.3"; - hash = "sha256-Yl5UOjcp0Q3WpiLgfjQFVVEQs4WlVUSBCS7kuO+39wQ="; + rev = "v2.4.3"; + hash = "sha256-OThT3fp676RMfYY3ehzM4DnAlJOqdPoYIHpoBbN/RHQ="; }; mastodonModern = pkgs.fetchgit { url = "https://git.gay/freeplay/Mastodon-Modern.git"; - rev = "5dc82786107bfb4dc4786571160d63a59cc609d6"; - hash = "sha256-0qr+PN1eTR2iqicJEEUskm0DchpZhocEVwoHfwOvHMw="; + rev = "9f8db85eda2a65aa020ab6b81d100a121d39d4c4"; + hash = "sha256-W6zwjAjBGARiRPM0hWCnq63nIT2Or0SOQq82bpNtqAk="; }; mastodonNekoversePatches = pkgs.fetchgit { url = "https://github.com/yuri-qq/nekoverse-mastodon-patches.git"; - hash = "sha256-3jWbKll5RGB1vfEmONVivzGYcoONEkBEHh/rOt9LXlU="; + hash = "sha256-NtdJWMi8/siduX2iFD+GAsK9J+Y6T/tZ/fXqb/QH284="; }; mastodonNekoverseOverlay = final: prev: { mastodon = (prev.mastodon.override rec { - version = "4.3.9"; + version = "4.4.1"; srcOverride = final.applyPatches { src = pkgs.stdenv.mkDerivation { name = "mastodonWithThemes"; src = pkgs.fetchgit { url = "https://github.com/mastodon/mastodon.git"; rev = "v${version}"; - sha256 = "sha256-A2WxVwaarT866s97uwfStBVtv7T5czF7ymRswtZ2K4M="; + sha256 = "sha256-hu6AmR0CvI3lVixJ2UmWY3KAlWbqYULCQAjRGJcuIhc="; }; # mastodon ships with broken symlinks, disable the check for that for now dontCheckForBrokenSymlinks = true; @@ -49,8 +49,8 @@ let "${mastodonNekoversePatches}/patches/006_increase_toot_character_limit.patch" ]; }; - yarnHash = "sha256-IC4d/skIHEzJPuKlq4rMAqV+ydqquA6toq4WWCfuDxo="; - yarnMissingHashes = null; + yarnHash = prev.mastodon.src.yarnHash; + yarnMissingHashes = prev.mastodon.src.yarnMissingHashes; }); }; pkgs-overlay = pkgs.extend mastodonNekoverseOverlay; @@ -62,7 +62,6 @@ in package = pkgs-overlay.mastodon; localDomain = "social.nekover.se"; secretKeyBaseFile = "/secrets/mastodon-secret-key-base.secret"; - otpSecretFile = "/secrets/mastodon-otp-secret.secret"; vapidPublicKeyFile = "${vapidPublicKey}"; vapidPrivateKeyFile = "/secrets/mastodon-vapid-private-key.secret"; smtp = { @@ -91,6 +90,8 @@ in OIDC_REDIRECT_URI = "https://social.nekover.se/auth/auth/openid_connect/callback"; OIDC_SECURITY_ASSUME_EMAIL_IS_VERIFIED = "true"; OIDC_END_SESSION_ENDPOINT = "https://id.nekover.se/realms/nekoverse/protocol/openid-connect/logout"; + FETCH_REPLIES_ENABLED = "true"; + AUTHORIZED_FETCH = "true"; }; extraEnvFiles = [ "/secrets/mastodon-keycloak-client-secret.secret" diff --git a/config/hosts/mastodon/secrets.nix b/config/hosts/mastodon/secrets.nix index 1389353..986a64b 100644 --- a/config/hosts/mastodon/secrets.nix +++ b/config/hosts/mastodon/secrets.nix @@ -9,14 +9,6 @@ permissions = "0640"; uploadAt = "pre-activation"; }; - "mastodon-otp-secret.secret" = { - keyCommand = keyCommandEnv ++ [ "pass" "mastodon/otp-secret" ]; - destDir = "/secrets"; - user = "mastodon"; - group = "mastodon"; - permissions = "0640"; - uploadAt = "pre-activation"; - }; "mastodon-vapid-private-key.secret" = { keyCommand = keyCommandEnv ++ [ "pass" "mastodon/vapid-private-key" ]; destDir = "/secrets";