diff options
| author | Ivan Tashkinov <ivant.business@gmail.com> | 2019-04-02 13:50:12 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivant.business@gmail.com> | 2019-04-02 13:50:12 +0300 |
| commit | 590c935d95f0ea4fb65994027a88a0623527af88 (patch) | |
| tree | 6b459dd8bc0fdb8c095e8f0088cb44d263f2e8d9 /docs/admin | |
| parent | 804173fc924ec591558b8ed7671e35b506be9345 (diff) | |
| parent | 9305e241cbbf78c634576dec58fb383563b39c58 (diff) | |
| download | pleroma-590c935d95f0ea4fb65994027a88a0623527af88.tar.gz | |
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# mix.exs
Diffstat (limited to 'docs/admin')
| -rw-r--r-- | docs/admin/backup.md | 6 | ||||
| -rw-r--r-- | docs/admin/updating.md | 10 |
2 files changed, 9 insertions, 7 deletions
diff --git a/docs/admin/backup.md b/docs/admin/backup.md index b373996f5..2c70e7bf8 100644 --- a/docs/admin/backup.md +++ b/docs/admin/backup.md @@ -1,4 +1,6 @@ -# Backup your instance +# Backup/Restore your instance + +## Backup 1. Stop the Pleroma service. 2. Go to the working directory of Pleroma (default is `/opt/pleroma`) @@ -6,7 +8,7 @@ 4. Copy `pleroma.pgdump`, `config/prod.secret.exs` and the `uploads` folder to your backup destination. If you have other modifications, copy those changes too. 5. Restart the Pleroma service. -## Restore your instance +## Restore 1. Stop the Pleroma service. 2. Go to the working directory of Pleroma (default is `/opt/pleroma`) diff --git a/docs/admin/updating.md b/docs/admin/updating.md index 33ce1ab4f..84e6ef18d 100644 --- a/docs/admin/updating.md +++ b/docs/admin/updating.md @@ -1,9 +1,9 @@ # Updating your instance -1. Stop the Pleroma service. -2. Go to the working directory of Pleroma (default is `/opt/pleroma`) -3. Run `git pull`. This pulls the latest changes from upstream. -4. Run `mix deps.get`. This pulls in any new dependencies. +1. Go to the working directory of Pleroma (default is `/opt/pleroma`) +2. Run `git pull`. This pulls the latest changes from upstream. +3. Run `mix deps.get`. This pulls in any new dependencies. +4. Stop the Pleroma service. 5. Run `mix ecto.migrate`[^1]. This task performs database migrations, if there were any. -6. Restart the Pleroma service. +6. Start the Pleroma service. [^1]: Prefix with `MIX_ENV=prod` to run it using the production config file. |