From c34269a83e48e5ec5e1064a393827f9dbcd21658 Mon Sep 17 00:00:00 2001 From: Thary Date: Fri, 12 Sep 2025 15:26:28 +0300 Subject: [PATCH] fix --- module.nix | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/module.nix b/module.nix index 1cd04cb..33e3f14 100644 --- a/module.nix +++ b/module.nix @@ -9,7 +9,7 @@ let cfg = sp.modules.mastodon; oauthClientID = "mastodon"; auth-passthru = config.selfprivacy.passthru.auth; - oauthDiscoveryURL = config.services.kanidm.serverSettings.origin; + oauthDiscoveryURL = auth-passthru.oauth2-discovery-url oauthClientID; issuer = lib.strings.removeSuffix "/.well-known/openid-configuration" oauthDiscoveryURL; usersGroup = "sp.mastodon.users"; @@ -61,13 +61,6 @@ in }; config = lib.mkIf cfg.enable { - assertions = [ - { - assertion = sp.sso.enable; - message = "Mastodon cannot be enabled when SSO is disabled."; - } - ]; - fileSystems = lib.mkIf sp.useBinds { "/var/lib/mastodon" = { device = "/volumes/${cfg.location}/mastodon"; @@ -102,10 +95,10 @@ in }; }; - mailserver.loginAccounts."noreply.mastodon@${sp.domain}" = { - hashedPassword = "/run/keys/mastodon/email_password"; - sendOnly = true; - }; + # mailserver.loginAccounts."noreply.mastodon@${sp.domain}" = { + # hashedPasswordFile = "/run/keys/mastodon/email_password"; + # sendOnly = true; + # }; services.postfix.config.virtual_mailbox_maps = [ "hash:/run/postfix/mastodon.cf" ];