Merge remote-tracking branch 'pleroma/develop' into feature/disable-account

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 7792e9a87c84d82bac769b2d35e8a3bcdb82edaf..8d44c96def995da04de471080d75d29f4b74033f 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -212,6 +212,11 @@ config :pleroma, :instance,
   registrations_open: true,
   federating: true,
   federation_reachability_timeout_days: 7,
+  federation_publisher_modules: [
+    Pleroma.Web.ActivityPub.Publisher,
+    Pleroma.Web.Websub,
+    Pleroma.Web.Salmon
+  ],
   allow_relay: true,
   rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy,
   public: true,
@@ -232,8 +237,9 @@ 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, :app_account_creation, enabled: false, max_requests: 5, interval: 1800
 
 config :pleroma, :markup,
   # XXX - unfortunately, inline images must be enabled by default right now, because
@@ -418,7 +424,8 @@ config :pleroma_job_queue, :queues,
   mailer: 10,
   transmogrifier: 20,
   scheduled_activities: 10,
-  background: 5
+  background: 5,
+  user: 10
 
 config :pleroma, :fetch_initial_posts,
   enabled: false,
@@ -473,6 +480,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"