diff options
author | lain <lain@soykaf.club> | 2020-11-17 15:01:38 +0100 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-11-17 15:01:38 +0100 |
commit | fec1ed802ef44a700df27aa132146f79e9e4cd6d (patch) | |
tree | 6bbb39b647305521209bebbd7bdea3e4be012d1c /docs/installation | |
parent | 81293e5aadd5f1dfe7f90f6a71f625ef86cf3359 (diff) | |
parent | 9b9afe6b3fde77ef005629fe2d198160c8f465a1 (diff) | |
download | pleroma-fec1ed802ef44a700df27aa132146f79e9e4cd6d.tar.gz |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
Diffstat (limited to 'docs/installation')
-rw-r--r-- | docs/installation/debian_based_en.md | 3 | ||||
-rw-r--r-- | docs/installation/otp_en.md | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/docs/installation/debian_based_en.md b/docs/installation/debian_based_en.md index b9fc4e112..2b1c7406f 100644 --- a/docs/installation/debian_based_en.md +++ b/docs/installation/debian_based_en.md @@ -35,7 +35,7 @@ sudo apt full-upgrade * Install some of the above mentioned programs: ```shell -sudo apt install git build-essential postgresql postgresql-contrib cmake libmagic-devel +sudo apt install git build-essential postgresql postgresql-contrib cmake libmagic-dev ``` ### Install Elixir and Erlang @@ -182,7 +182,6 @@ sudo cp /opt/pleroma/installation/pleroma.service /etc/systemd/system/pleroma.se ``` * Edit the service file and make sure that all paths fit your installation -* Check that `EnvironmentFile` contains the correct path to the env file. Or generate the env file: `sudo -Hu pleroma mix pleroma.release_env gen` * Enable and start `pleroma.service`: ```shell diff --git a/docs/installation/otp_en.md b/docs/installation/otp_en.md index 98360bcf7..63eda63ca 100644 --- a/docs/installation/otp_en.md +++ b/docs/installation/otp_en.md @@ -149,9 +149,6 @@ 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" |