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/otp_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/otp_en.md')
-rw-r--r-- | docs/installation/otp_en.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/installation/otp_en.md b/docs/installation/otp_en.md index 42e264e65..8e43e3239 100644 --- a/docs/installation/otp_en.md +++ b/docs/installation/otp_en.md @@ -232,7 +232,7 @@ At this point if you open your (sub)domain in a browser you should see a 502 err If everything worked, you should see Pleroma-FE when visiting your domain. If that didn't happen, try reviewing the installation steps, starting Pleroma in the foreground and seeing if there are any errrors. -Still doesn't work? Feel free to contact us on [#pleroma on freenode](https://irc.pleroma.social) or via matrix at <https://matrix.heldscal.la/#/room/#freenode_#pleroma:matrix.org>, you can also [file an issue on our Gitlab](https://git.pleroma.social/pleroma/pleroma-support/issues/new) +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, you can also [file an issue on our Gitlab](https://git.pleroma.social/pleroma/pleroma-support/issues/new). ## Post installation @@ -290,7 +290,7 @@ nginx -t ## Create your first user and set as admin ```sh -cd /opt/pleroma/bin +cd /opt/pleroma su pleroma -s $SHELL -lc "./bin/pleroma_ctl user new joeuser joeuser@sld.tld --admin" ``` This will create an account withe the username of 'joeuser' with the email address of joeuser@sld.tld, and set that user's account as an admin. This will result in a link that you can paste into the browser, which logs you in and enables you to set the password. @@ -301,4 +301,4 @@ This will create an account withe the username of 'joeuser' with the email addre ## 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, you can also [file an issue on our Gitlab](https://git.pleroma.social/pleroma/pleroma-support/issues/new). |