diff options
| author | Roman Chvanikov <chvanikoff@gmail.com> | 2019-05-08 17:08:06 +0700 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@gmail.com> | 2019-05-08 17:08:06 +0700 |
| commit | b6b5b16ba4d65ecd9812b02d79f844548266eb8b (patch) | |
| tree | 790623e31fed199f04168bcbddb4222a4bfb0a3a /config/config.exs | |
| parent | 0f0cc2703b7ffb99c58e72782925ea4dd61db41d (diff) | |
| parent | 14deed7f7d0b88d5c8ac19bb3de467429c289746 (diff) | |
| download | pleroma-b6b5b16ba4d65ecd9812b02d79f844548266eb8b.tar.gz pleroma-b6b5b16ba4d65ecd9812b02d79f844548266eb8b.zip | |
Merge develop
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index eeaaedf48..f05b9db29 100644 --- a/config/config.exs +++ b/config/config.exs @@ -416,7 +416,8 @@ config :pleroma_job_queue, :queues, web_push: 50, mailer: 10, transmogrifier: 20, - scheduled_activities: 10 + scheduled_activities: 10, + background: 5 config :pleroma, :fetch_initial_posts, enabled: false, @@ -443,6 +444,9 @@ config :pleroma, :ldap, base: System.get_env("LDAP_BASE") || "dc=example,dc=com", uid: System.get_env("LDAP_UID") || "cn" +config :esshd, + enabled: false + oauth_consumer_strategies = String.split(System.get_env("OAUTH_CONSUMER_STRATEGIES") || "") ueberauth_providers = @@ -476,6 +480,10 @@ config :pleroma, :email_notifications, inactivity_threshold: 7 } +config :pleroma, :oauth2, + token_expires_in: 600, + issue_new_refresh_token: true + # Import environment specific config. This must remain at the bottom # of this file so it overrides the configuration defined above. import_config "#{Mix.env()}.exs" |