summaryrefslogtreecommitdiff
path: root/config/config.exs
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2019-09-17 21:20:08 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2019-09-17 21:20:08 +0300
commit7dd51652f96db8479fb3848c3a993b74b7246d27 (patch)
treeeb8736f2a8312660aab215589dd9a0304d49f856 /config/config.exs
parentd75bc728e7e309174373e234079aa4825c81ab3e (diff)
parent7318095657175ff05a09af83b981110a58026cf9 (diff)
downloadpleroma-7dd51652f96db8479fb3848c3a993b74b7246d27.tar.gz
pleroma-7dd51652f96db8479fb3848c3a993b74b7246d27.zip
Merge branch 'develop' into issue/733
Diffstat (limited to 'config/config.exs')
-rw-r--r--config/config.exs6
1 files changed, 5 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs
index ab6e00c98..c7e0cf09f 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -276,7 +276,7 @@ config :pleroma, :instance,
max_account_fields: 10,
max_remote_account_fields: 20,
account_field_name_length: 512,
- account_field_value_length: 512,
+ account_field_value_length: 2048,
external_user_synchronization: true
config :pleroma, :markup,
@@ -331,6 +331,10 @@ config :pleroma, :activitypub,
follow_handshake_timeout: 500,
sign_object_fetches: true
+config :pleroma, :streamer,
+ workers: 3,
+ overflow_workers: 2
+
config :pleroma, :user, deny_follow_blocked: true
config :pleroma, :mrf_normalize_markup, scrub_policy: Pleroma.HTML.Scrubber.Default