diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-11-14 16:39:45 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-11-14 16:39:45 +0700 |
| commit | 3c0abfca53751624ebd6ea7174ee880d9e7b29e7 (patch) | |
| tree | ba16c5af44532a9b76640f1f48651c90d1be8a6f /config | |
| parent | 768c1a5de172151beb34e6dda13d4fb05e05ed87 (diff) | |
| parent | 6085c71bd17e2b676e0820bf3fd93f81a1902ac3 (diff) | |
| download | pleroma-3c0abfca53751624ebd6ea7174ee880d9e7b29e7.tar.gz pleroma-3c0abfca53751624ebd6ea7174ee880d9e7b29e7.zip | |
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/config/config.exs b/config/config.exs index a69d41d17..75f463797 100644 --- a/config/config.exs +++ b/config/config.exs @@ -90,7 +90,7 @@ config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank. config :pleroma, Pleroma.Upload, uploader: Pleroma.Uploaders.Local, filters: [Pleroma.Upload.Filter.Dedupe], - link_name: true, + link_name: false, proxy_remote: false, proxy_opts: [ redirect_on_failure: false, @@ -257,7 +257,7 @@ config :pleroma, :instance, mrf_transparency_exclusions: [], autofollowed_nicknames: [], max_pinned_statuses: 1, - no_attachment_links: false, + no_attachment_links: true, welcome_user_nickname: nil, welcome_message: nil, max_report_comment_size: 1000, @@ -274,7 +274,13 @@ config :pleroma, :instance, account_field_name_length: 512, account_field_value_length: 2048, external_user_synchronization: true, - extended_nickname_format: false + extended_nickname_format: true + +config :pleroma, :feed, + post_title: %{ + max_length: 100, + omission: "..." + } config :pleroma, :markup, # XXX - unfortunately, inline images must be enabled by default right now, because @@ -284,8 +290,8 @@ config :pleroma, :markup, allow_tables: false, allow_fonts: false, scrub_policy: [ - Pleroma.HTML.Transform.MediaProxy, - Pleroma.HTML.Scrubber.Default + Pleroma.HTML.Scrubber.Default, + Pleroma.HTML.Transform.MediaProxy ] config :pleroma, :frontend_configurations, @@ -599,10 +605,13 @@ config :pleroma, Pleroma.ActivityExpiration, enabled: true config :pleroma, Pleroma.Plugs.RemoteIp, enabled: false +config :pleroma, :static_fe, enabled: false + config :pleroma, :web_cache_ttl, activity_pub: nil, activity_pub_question: 30_000 +config :swarm, node_blacklist: [~r/myhtml_.*$/] # 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" |