diff --git a/module.nix b/module.nix index f7bddd6..0330774 100644 --- a/module.nix +++ b/module.nix @@ -132,9 +132,8 @@ in serviceConfig = { LoadCredential = ["client-secret:${oauthClientSecretFP}"]; ExecStart = lib.mkForce (pkgs.writeShellScript "run-mastodon-with-client-secret" '' - export CLIENT_SECRET=$(cat $CREDENTIALS_DIRECTORY/client-secret) - echo -n $CLIENT_SECRET # TODO: debug only option - CLIENT_SECRET=$(cat $CREDENTIALS_DIRECTORY/client-secret) ${config.services.mastodon.package}/bin/puma -C config/puma.rb + export OIDC_CLIENT_SECRET=$(cat $CREDENTIALS_DIRECTORY/client-secret) + ${config.services.mastodon.package}/bin/puma -C config/puma.rb ''); }; environment = { @@ -143,7 +142,6 @@ in OIDC_ENABLED = "true"; OIDC_DISPLAY_NAME= "Kanidm"; OIDC_ISSUER = issuer; - # OIDC_ISSUER = "https://auth.hollowness.top"; OIDC_DISCOVERY = "true"; OIDC_SCOPE = "openid,profile"; OIDC_UID_FIELD = "sub";