Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confirm-users...

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index d8bf921bbccf37b8c5ea2ed23605dba03d60e776..4b91a58b746de9830726a80d8a8524e8a997852e 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -238,6 +238,7 @@ config :pleroma, :instance,
   max_remote_account_fields: 20,
   account_field_name_length: 512,
   account_field_value_length: 2048,
+  registration_reason_length: 500,
   external_user_synchronization: true,
   extended_nickname_format: true,
   cleanup_attachments: false,
@@ -646,6 +647,16 @@ config :pleroma, Pleroma.Plugs.RemoteIp, enabled: true
 
 config :pleroma, :static_fe, enabled: false
 
+# Example of frontend configuration
+# This example will make us serve the primary frontend from the
+# frontends directory within your `:pleroma, :instance, static_dir`.
+# e.g., instance/static/frontends/pleroma/develop/
+#
+# With no frontend configuration, the bundled files from the `static` directory will
+# be used.
+#
+# config :pleroma, :frontends, primary: %{"name" => "pleroma", "ref" => "develop"}
+
 config :pleroma, :web_cache_ttl,
   activity_pub: nil,
   activity_pub_question: 30_000