summaryrefslogtreecommitdiff
path: root/docs/installation/arch_linux_en.md
diff options
context:
space:
mode:
authorSean King <seanking2919@protonmail.com>2021-06-04 14:42:44 -0600
committerSean King <seanking2919@protonmail.com>2021-06-04 14:42:44 -0600
commitdc4814f0cdc12a552001e5e22c979060e4f3f865 (patch)
tree38f8cb1729338768da447a27ae243c27d301c7bd /docs/installation/arch_linux_en.md
parent2de41770d04cf07ed8775a307b6d457a4750e265 (diff)
parent0c56f9de0d607b88fd107e0bd13ef286f0629346 (diff)
downloadpleroma-dc4814f0cdc12a552001e5e22c979060e4f3f865.tar.gz
pleroma-dc4814f0cdc12a552001e5e22c979060e4f3f865.zip
Fix merge conflicts with upstream
Diffstat (limited to 'docs/installation/arch_linux_en.md')
-rw-r--r--docs/installation/arch_linux_en.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/installation/arch_linux_en.md b/docs/installation/arch_linux_en.md
index da78c3205..d11deb621 100644
--- a/docs/installation/arch_linux_en.md
+++ b/docs/installation/arch_linux_en.md
@@ -92,7 +92,7 @@ cd /opt/pleroma
sudo -Hu pleroma mix deps.get
```
-* Generate the configuration: `sudo -Hu pleroma mix pleroma.instance gen`
+* Generate the configuration: `sudo -Hu pleroma MIX_ENV=prod mix pleroma.instance gen`
* Answer with `yes` if it asks you to install `rebar3`.
* This may take some time, because parts of pleroma get compiled first.
* After that it will ask you a few questions about your instance and generates a configuration file in `config/generated_config.exs`.
@@ -215,4 +215,4 @@ sudo -Hu pleroma MIX_ENV=prod mix pleroma.user new <username> <your@emailaddress
## 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.