diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-02-20 15:00:48 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-02-20 15:00:48 +0300 |
| commit | 0c65a8c3d02a5a9dc3a0a54fef3b86130cf3c0dd (patch) | |
| tree | 0e0f2ad4f7317b44e11f1df4d2e5fc9a301007e1 /config/config.exs | |
| parent | 343229465753ebcc59002a2dd604a910a8ce462d (diff) | |
| parent | e0b2de63853e9a14b72faddf6e1180a098728205 (diff) | |
| download | pleroma-0c65a8c3d02a5a9dc3a0a54fef3b86130cf3c0dd.tar.gz pleroma-0c65a8c3d02a5a9dc3a0a54fef3b86130cf3c0dd.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
# Conflicts:
# config/config.exs
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index cb1551c2a..47b53d5af 100644 --- a/config/config.exs +++ b/config/config.exs @@ -483,12 +483,14 @@ config :pleroma, Oban, background: 5, remote_fetcher: 2, attachments_cleanup: 5 + new_users_digest: 1 ], crontab: [ {"0 0 * * *", Pleroma.Workers.Cron.ClearOauthTokenWorker}, {"0 * * * *", Pleroma.Workers.Cron.StatsWorker}, {"* * * * *", Pleroma.Workers.Cron.PurgeExpiredActivitiesWorker}, - {"0 0 * * 0", Pleroma.Workers.Cron.DigestEmailsWorker} + {"0 0 * * 0", Pleroma.Workers.Cron.DigestEmailsWorker}, + {"0 0 * * *", Pleroma.Workers.Cron.NewUsersDigestWorker} ] config :pleroma, :workers, @@ -562,6 +564,8 @@ config :pleroma, Pleroma.Emails.UserEmail, text_muted_color: "#b9b9ba" } +config :pleroma, Pleroma.Emails.NewUsersDigestEmail, enabled: false + config :prometheus, Pleroma.Web.Endpoint.MetricsExporter, path: "/api/pleroma/app_metrics" config :pleroma, Pleroma.ScheduledActivity, |