diff --git a/CHANGELOG.md b/CHANGELOG.md index f39a0d5f8..83ccb5920 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2401,10 +2401,10 @@ The new version of [matrix-sms-bridge](https://github.com/benkuly/matrix-sms-bri 1. Add the following to your `vars.yml` file: `matrix_sms_bridge_container_extra_arguments=['--env SPRING_PROFILES_ACTIVE=initialsync']` 2. Login to your host shell and remove old systemd file from your host: `rm /etc/systemd/system/matrix-sms-bridge-database.service` -2. Run `ansible-playbook -i inventory/hosts setup.yml --tags=setup-matrix-sms-bridge,start` -3. Login to your host shell and check the logs with `journalctl -u matrix-sms-bridge` until the sync finished. -4. Remove the var from the first step. -5. Run `ansible-playbook -i inventory/hosts setup.yml --tags=setup-all,start`. +3. Run `ansible-playbook -i inventory/hosts setup.yml --tags=setup-matrix-sms-bridge,start` +4. Login to your host shell and check the logs with `journalctl -u matrix-sms-bridge` until the sync finished. +5. Remove the var from the first step. +6. Run `ansible-playbook -i inventory/hosts setup.yml --tags=setup-all,start`. # 2020-11-10 diff --git a/docs/configuring-playbook-s3-goofys.md b/docs/configuring-playbook-s3-goofys.md index ac32c698c..6eeafbfd4 100644 --- a/docs/configuring-playbook-s3-goofys.md +++ b/docs/configuring-playbook-s3-goofys.md @@ -59,9 +59,9 @@ matrix_s3_media_store_path: /matrix/s3-media-store This enables S3 support, but mounts the S3 storage bucket to `/matrix/s3-media-store` without hooking it to your homeserver yet. Your homeserver will still continue using your local filesystem for its media store. -5. Run the playbook to apply the changes: `ansible-playbook -i inventory/hosts setup.yml --tags=setup-all,start` +4. Run the playbook to apply the changes: `ansible-playbook -i inventory/hosts setup.yml --tags=setup-all,start` -6. Do an **initial sync of your files** by running this **on the server** (it may take a very long time): +5. Do an **initial sync of your files** by running this **on the server** (it may take a very long time): ```sh sudo -u matrix -- rsync --size-only --ignore-existing -avr /matrix/synapse/storage/media-store/. /matrix/s3-media-store/. @@ -69,27 +69,27 @@ sudo -u matrix -- rsync --size-only --ignore-existing -avr /matrix/synapse/stora You may need to install `rsync` manually. -7. Stop all Matrix services (`ansible-playbook -i inventory/hosts setup.yml --tags=stop`) +6. Stop all Matrix services (`ansible-playbook -i inventory/hosts setup.yml --tags=stop`) -8. Start the S3 service by running this **on the server**: `systemctl start matrix-goofys` +7. Start the S3 service by running this **on the server**: `systemctl start matrix-goofys` -9. Sync the files again by re-running the `rsync` command you see in step #6 +8. Sync the files again by re-running the `rsync` command you see in step #6 -10. Stop the S3 service by running this **on the server**: `systemctl stop matrix-goofys` +9. Stop the S3 service by running this **on the server**: `systemctl stop matrix-goofys` -11. Get the old media store out of the way by running this command on the server: +10. Get the old media store out of the way by running this command on the server: ```sh mv /matrix/synapse/storage/media-store /matrix/synapse/storage/media-store-local-backup ``` -12. Remove the `matrix_s3_media_store_path` configuration from your `vars.yml` file (undoing step #3 above) +11. Remove the `matrix_s3_media_store_path` configuration from your `vars.yml` file (undoing step #3 above) -13. Run the playbook: `ansible-playbook -i inventory/hosts setup.yml --tags=setup-all,start` +12. Run the playbook: `ansible-playbook -i inventory/hosts setup.yml --tags=setup-all,start` -14. You're done! Verify that loading existing (old) media files works and that you can upload new ones. +13. You're done! Verify that loading existing (old) media files works and that you can upload new ones. -15. When confident that it all works, get rid of the local media store directory: `rm -rf /matrix/synapse/storage/media-store-local-backup` +14. When confident that it all works, get rid of the local media store directory: `rm -rf /matrix/synapse/storage/media-store-local-backup` ### Migrating to Backblaze B2 diff --git a/docs/configuring-well-known.md b/docs/configuring-well-known.md index ccbfd6643..ffe13092c 100644 --- a/docs/configuring-well-known.md +++ b/docs/configuring-well-known.md @@ -180,7 +180,7 @@ backend matrix-backend **For AWS CloudFront** 1. Add a custom origin with matrix.example.com to your distribution - 1. Add two behaviors, one for `.well-known/matrix/client` and one for `.well-known/matrix/server` and point them to your new origin. + 2. Add two behaviors, one for `.well-known/matrix/client` and one for `.well-known/matrix/server` and point them to your new origin. Make sure to: diff --git a/docs/obtaining-access-tokens.md b/docs/obtaining-access-tokens.md index 913f1b90c..301ea8db2 100644 --- a/docs/obtaining-access-tokens.md +++ b/docs/obtaining-access-tokens.md @@ -13,10 +13,10 @@ Below, we describe 2 ways to generate an access token for a user - using [Elemen ## Obtain an access token via Element 1. In a private browsing session (incognito window), open Element. -1. Log in with the user's credentials. -1. In the settings page, choose "Help & About", scroll down to the bottom and expand the `Access Token` section (see screenshot below). -1. Copy the access token to your configuration. -1. Close the private browsing session. **Do not log out**. Logging out will invalidate the token, making it not work. +2. Log in with the user's credentials. +3. In the settings page, choose "Help & About", scroll down to the bottom and expand the `Access Token` section (see screenshot below). +4. Copy the access token to your configuration. +5. Close the private browsing session. **Do not log out**. Logging out will invalidate the token, making it not work. ![Obtaining an access token with Element](assets/obtain_admin_access_token_element.png)