diff options
| author | feld <feld@feld.me> | 2024-10-25 16:01:10 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2024-10-25 16:01:10 +0000 |
| commit | 2d591aedaeda3d80e9c1b31c0c83eae954849f36 (patch) | |
| tree | 86b715df97ebb56a8149ef1ca8fbd09223d94ad0 | |
| parent | bb3403abd80f33fe2deddedc201fbc7cc8cee506 (diff) | |
| parent | 00b6a586acfbd60883fc1197fb5d5ed459606c9e (diff) | |
| download | pleroma-2d591aedaeda3d80e9c1b31c0c83eae954849f36.tar.gz pleroma-2d591aedaeda3d80e9c1b31c0c83eae954849f36.zip | |
Merge branch 'fzdevelop' into 'develop'
OpenBSD docs update
See merge request pleroma/pleroma!4290
| -rw-r--r-- | changelog.d/docs-vips.skip | 0 | ||||
| -rw-r--r-- | docs/installation/openbsd_en.md | 2 | ||||
| -rw-r--r-- | docs/installation/openbsd_fi.md | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/changelog.d/docs-vips.skip b/changelog.d/docs-vips.skip new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/changelog.d/docs-vips.skip diff --git a/docs/installation/openbsd_en.md b/docs/installation/openbsd_en.md index e58e144d2..78bbf399f 100644 --- a/docs/installation/openbsd_en.md +++ b/docs/installation/openbsd_en.md @@ -12,7 +12,7 @@ For any additional information regarding commands and configuration files mentio To install them, run the following command (with doas or as root): ``` -pkg_add elixir gmake git postgresql-server postgresql-contrib cmake ffmpeg ImageMagick +pkg_add elixir gmake git postgresql-server postgresql-contrib cmake ffmpeg ImageMagick libvips ``` Pleroma requires a reverse proxy, OpenBSD has relayd in base (and is used in this guide) and packages/ports are available for nginx (www/nginx) and apache (www/apache-httpd). Independently of the reverse proxy, [acme-client(1)](https://man.openbsd.org/acme-client) can be used to get a certificate from Let's Encrypt. diff --git a/docs/installation/openbsd_fi.md b/docs/installation/openbsd_fi.md index 73aca3a6f..d7c94d8a0 100644 --- a/docs/installation/openbsd_fi.md +++ b/docs/installation/openbsd_fi.md @@ -18,7 +18,7 @@ Matrix-kanava #pleroma:libera.chat ovat hyviä paikkoja löytää apua Asenna tarvittava ohjelmisto: -`# pkg_add git elixir gmake postgresql-server-10.3 postgresql-contrib-10.3 cmake ffmpeg ImageMagick` +`# pkg_add git elixir gmake postgresql-server-10.3 postgresql-contrib-10.3 cmake ffmpeg ImageMagick libvips` #### Optional software |