diff options
author | Sean King <seanking2919@protonmail.com> | 2021-06-04 14:42:44 -0600 |
---|---|---|
committer | Sean King <seanking2919@protonmail.com> | 2021-06-04 14:42:44 -0600 |
commit | dc4814f0cdc12a552001e5e22c979060e4f3f865 (patch) | |
tree | 38f8cb1729338768da447a27ae243c27d301c7bd /docs/installation/openbsd_en.md | |
parent | 2de41770d04cf07ed8775a307b6d457a4750e265 (diff) | |
parent | 0c56f9de0d607b88fd107e0bd13ef286f0629346 (diff) | |
download | pleroma-dc4814f0cdc12a552001e5e22c979060e4f3f865.tar.gz pleroma-dc4814f0cdc12a552001e5e22c979060e4f3f865.zip |
Fix merge conflicts with upstream
Diffstat (limited to 'docs/installation/openbsd_en.md')
-rw-r--r-- | docs/installation/openbsd_en.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/installation/openbsd_en.md b/docs/installation/openbsd_en.md index 0e1269ca5..95f029180 100644 --- a/docs/installation/openbsd_en.md +++ b/docs/installation/openbsd_en.md @@ -239,7 +239,7 @@ Enter a shell as \_pleroma (as root `su _pleroma -`) and enter pleroma's install Then follow the main installation guide: * run `mix deps.get` - * run `mix pleroma.instance gen` and enter your instance's information when asked + * run `MIX_ENV=prod mix pleroma.instance gen` and enter your instance's information when asked * copy config/generated\_config.exs to config/prod.secret.exs. The default values should be sufficient but you should edit it and check that everything seems OK. * exit your current shell back to a root one and run `psql -U postgres -f /home/_pleroma/pleroma/config/setup_db.psql` to setup the database. * return to a \_pleroma shell into pleroma's installation directory (`su _pleroma -;cd ~/pleroma`) and run `MIX_ENV=prod mix ecto.migrate` @@ -264,4 +264,4 @@ LC_ALL=en_US.UTF-8 MIX_ENV=prod mix pleroma.user new <username> <your@emailaddre ## Questions -Questions about the installation or didn’t it work as it should be, ask in [#pleroma:matrix.org](https://matrix.heldscal.la/#/room/#freenode_#pleroma:matrix.org) or IRC Channel **#pleroma** on **Freenode**. +Questions about the installation or didn’t it work as it should be, ask in [#pleroma:libera.chat](https://matrix.to/#/#pleroma:libera.chat) via Matrix or **#pleroma** on **libera.chat** via IRC. |