Merge branch 'issue_800' into 'develop'

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 12dbe994175cd256adcb8ec614fa85a211637139..946ba9adf1d6062f1da88660835c4d20e32b94ae 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -445,6 +445,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 =
@@ -470,6 +473,10 @@ config :pleroma, Pleroma.ScheduledActivity,
   total_user_limit: 300,
   enabled: true
 
+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"