diff options
| author | marcin mikołajczak <git@mkljczk.pl> | 2023-12-22 13:29:56 +0100 |
|---|---|---|
| committer | marcin mikołajczak <git@mkljczk.pl> | 2023-12-22 13:29:56 +0100 |
| commit | 28e5e65676ea08ae9e329d51648baf06dcf950c0 (patch) | |
| tree | fd0b04e34a2f3df53b35ed5c3eb8301ad242ede6 /docs/installation | |
| parent | 39d3df86c8e2ee05d409865ebc866c543a604ad9 (diff) | |
| parent | 5f1d70736711275ac9f0c95e5ada4cb2f1a96e11 (diff) | |
| download | pleroma-28e5e65676ea08ae9e329d51648baf06dcf950c0.tar.gz pleroma-28e5e65676ea08ae9e329d51648baf06dcf950c0.zip | |
Merge remote-tracking branch 'origin/develop' into webfinger-fix
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
Diffstat (limited to 'docs/installation')
| -rw-r--r-- | docs/installation/freebsd_en.md | 3 | ||||
| -rw-r--r-- | docs/installation/generic_dependencies.include | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/docs/installation/freebsd_en.md b/docs/installation/freebsd_en.md index 50ed30d74..02513daf2 100644 --- a/docs/installation/freebsd_en.md +++ b/docs/installation/freebsd_en.md @@ -9,7 +9,7 @@ This document was written for FreeBSD 12.1, but should be work on future release This assumes the target system has `pkg(8)`. ``` -# pkg install elixir postgresql12-server postgresql12-client postgresql12-contrib git-lite sudo nginx gmake acme.sh cmake +# pkg install elixir postgresql12-server postgresql12-client postgresql12-contrib git-lite sudo nginx gmake acme.sh cmake vips ``` Copy the rc.d scripts to the right directory: @@ -41,6 +41,7 @@ Create a user for Pleroma: ``` # pw add user pleroma -m # echo 'export LC_ALL="en_US.UTF-8"' >> /home/pleroma/.profile +# echo 'export VIX_COMPILATION_MODE=PLATFORM_PROVIDED_LIBVIPS' >> /home/pleroma/.profile # su -l pleroma ``` diff --git a/docs/installation/generic_dependencies.include b/docs/installation/generic_dependencies.include index dcaacfdfd..3365a36a8 100644 --- a/docs/installation/generic_dependencies.include +++ b/docs/installation/generic_dependencies.include @@ -1,11 +1,11 @@ ## Required dependencies -* PostgreSQL 9.6+ -* Elixir 1.10+ -* Erlang OTP 22.2+ +* PostgreSQL >=9.6 +* Elixir >=1.11.0 <1.15 +* Erlang OTP >=22.2.0 <26 * git * file / libmagic -* gcc (clang might also work) +* gcc or clang * GNU make * CMake |