diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-11-21 19:47:46 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-11-21 19:47:46 +0300 |
| commit | 489b12cde48d0ed6b16914c5a831b1e992d0d059 (patch) | |
| tree | 2928b5b9111339f16a5642c4ec07c82851c4f7ed /docs/installation | |
| parent | ccc2cf0e87f47618163da588ead76846c64cba7a (diff) | |
| parent | ecd1ef8cb5afa16dba5158e9e278a18c0856ca3e (diff) | |
| download | pleroma-489b12cde48d0ed6b16914c5a831b1e992d0d059.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
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" |