fix
This commit is contained in:
17
module.nix
17
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" ];
|
||||
|
||||
|
Reference in New Issue
Block a user