X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=config%2Fconfig.exs;h=1e64b79a7a043ed4b4194c23e4910a7793c6e003;hb=1cb7a15727494da686877d0cae9155973da4148d;hp=12dbe994175cd256adcb8ec614fa85a211637139;hpb=4dabf64af45232afdbbb15d9a697a64e15a749ee;p=akkoma

diff --git a/config/config.exs b/config/config.exs
index 12dbe9941..1e64b79a7 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -232,8 +232,7 @@ config :pleroma, :instance,
   welcome_message: nil,
   max_report_comment_size: 1000,
   safe_dm_mentions: false,
-  healthcheck: false,
-  repo_batch_size: 500
+  healthcheck: false
 
 config :pleroma, :markup,
   # XXX - unfortunately, inline images must be enabled by default right now, because
@@ -445,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 =
@@ -470,6 +472,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"