diff options
| author | lain <lain@soykaf.club> | 2019-08-08 14:38:33 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-08-08 14:38:33 +0000 |
| commit | 29807ef6a5b43a528ffca08b4f721b251f331c8d (patch) | |
| tree | 76930c3a3dc12b95bcb57a9b4832f861dd68d960 /config | |
| parent | b18234e04c76daa564e0d8157dcd09566485da24 (diff) | |
| parent | 9d4f34fbcb1a8e2eca424b3a3374c9f9af972574 (diff) | |
| download | pleroma-29807ef6a5b43a528ffca08b4f721b251f331c8d.tar.gz pleroma-29807ef6a5b43a528ffca08b4f721b251f331c8d.zip | |
Merge branch 'feature/digest-email' into 'develop'
Feature/digest email
See merge request pleroma/pleroma!1078
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 8 | ||||
| -rw-r--r-- | config/test.exs | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 17770640a..d2325edbc 100644 --- a/config/config.exs +++ b/config/config.exs @@ -514,6 +514,14 @@ config :pleroma, Pleroma.ScheduledActivity, total_user_limit: 300, enabled: true +config :pleroma, :email_notifications, + digest: %{ + active: false, + schedule: "0 0 * * 0", + interval: 7, + inactivity_threshold: 7 + } + config :pleroma, :oauth2, token_expires_in: 600, issue_new_refresh_token: true, diff --git a/config/test.exs b/config/test.exs index aded8600d..6f75f39b5 100644 --- a/config/test.exs +++ b/config/test.exs @@ -81,6 +81,8 @@ rum_enabled = System.get_env("RUM_ENABLED") == "true" config :pleroma, :database, rum_enabled: rum_enabled IO.puts("RUM enabled: #{rum_enabled}") +config :joken, default_signer: "yU8uHKq+yyAkZ11Hx//jcdacWc8yQ1bxAAGrplzB0Zwwjkp35v0RK9SO8WTPr6QZ" + config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock try do |