diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2019-07-14 21:43:30 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2019-07-14 21:43:30 +0300 |
| commit | c729883936c7d258cb670929af9577aec3e22851 (patch) | |
| tree | 17aec90897b221c000be1992001967a3861a6c10 /config | |
| parent | 0384459ce552c50edb582413808a099086b6495e (diff) | |
| parent | 93701c3399add8af2d4a5d43b6f171d84655a533 (diff) | |
| download | pleroma-c729883936c7d258cb670929af9577aec3e22851.tar.gz pleroma-c729883936c7d258cb670929af9577aec3e22851.zip | |
Merge branch 'develop' into feature/digest-email
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index a1a510a65..f7b862ad7 100644 --- a/config/config.exs +++ b/config/config.exs @@ -194,6 +194,8 @@ config :pleroma, :http, send_user_agent: true, adapter: [ ssl_options: [ + # Workaround for remote server certificate chain issues + partial_chain: &:hackney_connect.partial_chain/1, # We don't support TLS v1.3 yet versions: [:tlsv1, :"tlsv1.1", :"tlsv1.2"] ] @@ -238,6 +240,7 @@ config :pleroma, :instance, "text/bbcode" ], mrf_transparency: true, + mrf_transparency_exclusions: [], autofollowed_nicknames: [], max_pinned_statuses: 1, no_attachment_links: false, @@ -336,7 +339,12 @@ config :pleroma, :mrf_subchain, match_actor: %{} config :pleroma, :rich_media, enabled: true, ignore_hosts: [], - ignore_tld: ["local", "localdomain", "lan"] + ignore_tld: ["local", "localdomain", "lan"], + parsers: [ + Pleroma.Web.RichMedia.Parsers.TwitterCard, + Pleroma.Web.RichMedia.Parsers.OGP, + Pleroma.Web.RichMedia.Parsers.OEmbed + ] config :pleroma, :media_proxy, enabled: false, @@ -527,7 +535,9 @@ config :http_signatures, config :pleroma, :rate_limit, search: [{1000, 10}, {1000, 30}], - app_account_creation: {1_800_000, 25} + app_account_creation: {1_800_000, 25}, + statuses_actions: {10_000, 15}, + status_id_action: {60_000, 3} # Import environment specific config. This must remain at the bottom # of this file so it overrides the configuration defined above. |