diff options
| author | lain <lain@soykaf.club> | 2020-07-29 13:45:15 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-07-29 13:45:15 +0000 |
| commit | a6d3bb5f30697cafc5dd9acf490bde7e2f33f5f8 (patch) | |
| tree | bddf044b51cacba7c80f8b054bb3c0781628fd15 /docs | |
| parent | 269b61a2402e3d12d09baf26ba73359776f556b0 (diff) | |
| parent | 8d6f7aec2145fc012677cfd9f61cb3e2720edd68 (diff) | |
| download | pleroma-a6d3bb5f30697cafc5dd9acf490bde7e2f33f5f8.tar.gz | |
Merge branch 'issue/1023' into 'develop'
[#1023] added generated `pleroma.env`
See merge request pleroma/pleroma!2763
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/administration/CLI_tasks/release_environments.md | 9 | ||||
| -rw-r--r-- | docs/installation/otp_en.md | 7 |
2 files changed, 14 insertions, 2 deletions
diff --git a/docs/administration/CLI_tasks/release_environments.md b/docs/administration/CLI_tasks/release_environments.md new file mode 100644 index 000000000..36ab43864 --- /dev/null +++ b/docs/administration/CLI_tasks/release_environments.md @@ -0,0 +1,9 @@ +# Generate release environment file + +```sh tab="OTP" + ./bin/pleroma_ctl release_env gen +``` + +```sh tab="From Source" +mix pleroma.release_env gen +``` diff --git a/docs/installation/otp_en.md b/docs/installation/otp_en.md index e4f822d1c..338dfa7d0 100644 --- a/docs/installation/otp_en.md +++ b/docs/installation/otp_en.md @@ -121,6 +121,9 @@ chown -R pleroma /etc/pleroma # Run the config generator su pleroma -s $SHELL -lc "./bin/pleroma_ctl instance gen --output /etc/pleroma/config.exs --output-psql /tmp/setup_db.psql" +# Run the environment file generator. +su pleroma -s $SHELL -lc "./bin/pleroma_ctl release_env gen" + # Create the postgres database su postgres -s $SHELL -lc "psql -f /tmp/setup_db.psql" @@ -131,7 +134,7 @@ su pleroma -s $SHELL -lc "./bin/pleroma_ctl migrate" # su pleroma -s $SHELL -lc "./bin/pleroma_ctl migrate --migrations-path priv/repo/optional_migrations/rum_indexing/" # Start the instance to verify that everything is working as expected -su pleroma -s $SHELL -lc "./bin/pleroma daemon" +su pleroma -s $SHELL -lc "export $(cat /opt/pleroma/config/pleroma.env); ./bin/pleroma daemon" # Wait for about 20 seconds and query the instance endpoint, if it shows your uri, name and email correctly, you are configured correctly sleep 20 && curl http://localhost:4000/api/v1/instance @@ -200,6 +203,7 @@ rc-update add pleroma # Copy the service into a proper directory cp /opt/pleroma/installation/pleroma.service /etc/systemd/system/pleroma.service + # Start pleroma and enable it on boot systemctl start pleroma systemctl enable pleroma @@ -275,4 +279,3 @@ 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**. - |