Merge branch 'audit-mix-audit-report' (#69) into release/2.11
# Conflicts: # lib/pleroma/http/adapter_helper/hackney.ex
This commit is contained in:
commit
9ea8d37e9f
23 changed files with 216 additions and 22 deletions
|
|
@ -541,6 +541,15 @@ Available caches:
|
|||
|
||||
## HTTP client
|
||||
|
||||
Pleroma uses [Gun](https://github.com/ninenines/gun) for outgoing HTTP requests. To use Hackney instead:
|
||||
|
||||
```elixir
|
||||
config :tesla, adapter: Tesla.Adapter.Hackney
|
||||
```
|
||||
|
||||
!!! note
|
||||
With Hackney, size limits for fetched responses (for example for link previews) are checked only after Hackney has read the whole response. They limit what Pleroma keeps, not how much it downloads or holds in memory. Gun stops reading at the limit.
|
||||
|
||||
### :http
|
||||
|
||||
* `proxy_url`: an upstream proxy to fetch posts and/or media with, (default: `nil`)
|
||||
|
|
@ -550,6 +559,8 @@ Available caches:
|
|||
|
||||
### :hackney_pools
|
||||
|
||||
*For `hackney` adapter*
|
||||
|
||||
Advanced. Tweaks Hackney (http client) connections pools.
|
||||
|
||||
There's three pools used:
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Note: This article is potentially outdated because at this time we may not have
|
|||
|
||||
- PostgreSQL 11.0以上 (Ubuntu16.04では9.5しか提供されていないので,[](https://www.postgresql.org/download/linux/ubuntu/)こちらから新しいバージョンを入手してください)
|
||||
- `postgresql-contrib` 11.0以上 (同上)
|
||||
- Elixir 1.15 以上 ([Debianのリポジトリからインストールしないこと!!! ここからインストールすること!](https://elixir-lang.org/install.html#unix-and-unix-like)。または [asdf](https://github.com/asdf-vm/asdf) をpleromaユーザーでインストールしてください)
|
||||
- Elixir 1.17 以上 (Erlang/OTP 27 以上) ([Debianのリポジトリからインストールしないこと!!! ここからインストールすること!](https://elixir-lang.org/install.html#unix-and-unix-like)。または [asdf](https://github.com/asdf-vm/asdf) をpleromaユーザーでインストールしてください)
|
||||
- `erlang-dev`
|
||||
- `erlang-nox`
|
||||
- `git`
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
* Elixir >=1.15.0, <1.20
|
||||
* Erlang OTP >=24.0.0 (supported: <29)
|
||||
* Elixir >=1.17.0, <1.20
|
||||
* Erlang OTP >=27.0.0 (supported: <29)
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ present, `uploads`, and `instance`. Diff and restore any other non-stock
|
|||
configuration files, preserve their ownership, and review them before starting
|
||||
Pleroma.
|
||||
|
||||
Pleroma requires Elixir 1.15 or newer. Install supported Erlang and Elixir
|
||||
Pleroma requires Elixir 1.17 or newer and Erlang/OTP 27 or newer. Install supported Erlang and Elixir
|
||||
versions as described in the installation guide for your distribution before
|
||||
running any Mix command. Do not reuse Rebased's `.tool-versions`. If you keep
|
||||
using [`asdf`](https://asdf-vm.com/), select supported versions in the
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue