From 91cf8e323074feec9b1ac407ec2ac8282c8d3842 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Fri, 25 Oct 2024 02:55:15 +0900 Subject: [PATCH 1/4] Update docs/configuring-playbook-s3-goofys.md: fix the anchor link for Backblaze B2 The link has been broken since ac7cb3619dfe522af280875566e859007f7a0374 Signed-off-by: Suguru Hirahara --- docs/configuring-playbook-s3-goofys.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/configuring-playbook-s3-goofys.md b/docs/configuring-playbook-s3-goofys.md index eb674faeb..b15a2bfcd 100644 --- a/docs/configuring-playbook-s3-goofys.md +++ b/docs/configuring-playbook-s3-goofys.md @@ -126,7 +126,7 @@ It's a good idea to [make a complete server backup](faq.md#how-do-i-backup-the-d mv /matrix/synapse/storage/media-store /matrix/synapse/storage/media-store-local-backup ``` -5. Put the [Backblaze B2 settings seen above](#backblaze-b2) in your `vars.yml` file +5. Put the [Backblaze B2 settings](configuring-playbook-s3.md#backblaze-b2) in your `vars.yml` file 6. Run the playbook: `ansible-playbook -i inventory/hosts setup.yml --tags=setup-all,start` From 1b117f1757b5bedef22271e9bd80cdaec8eb6eae Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Fri, 25 Oct 2024 03:14:53 +0900 Subject: [PATCH 2/4] Update docs/configuring-playbook-s3-goofys.md: update Table of Contents It is a legacy of docs/configuring-playbook-s3.md on ac7cb3619dfe522af280875566e859007f7a0374, and the upper levels of those two list items are redundant. Signed-off-by: Suguru Hirahara --- docs/configuring-playbook-s3-goofys.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/docs/configuring-playbook-s3-goofys.md b/docs/configuring-playbook-s3-goofys.md index b15a2bfcd..190b74ec7 100644 --- a/docs/configuring-playbook-s3-goofys.md +++ b/docs/configuring-playbook-s3-goofys.md @@ -36,11 +36,8 @@ It's a good idea to [make a complete server backup](faq.md#how-do-i-backup-the-d Follow one of the guides below for a migration path from a locally-stored media store to one stored on S3-compatible storage: -- [Storing Matrix media files on Amazon S3 with Goofys (optional)](#storing-matrix-media-files-on-amazon-s3-with-goofys-optional) - - [Usage](#usage) - - [Migrating from local filesystem storage to S3](#migrating-from-local-filesystem-storage-to-s3) - - [Migrating to any S3-compatible storage (universal, but likely slow)](#migrating-to-any-s3-compatible-storage-universal-but-likely-slow) - - [Migrating to Backblaze B2](#migrating-to-backblaze-b2) +- [Migrating to any S3-compatible storage (universal, but likely slow)](#migrating-to-any-s3-compatible-storage-universal-but-likely-slow) +- [Migrating to Backblaze B2](#migrating-to-backblaze-b2) ### Migrating to any S3-compatible storage (universal, but likely slow) From cbdf619bd4e9dda363b0c7318a6bb343412e627b Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Fri, 25 Oct 2024 03:20:38 +0900 Subject: [PATCH 3/4] Update docs/configuring-playbook-s3-goofys.md: remove repetitive suggestions to create a backup Signed-off-by: Suguru Hirahara --- docs/configuring-playbook-s3-goofys.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/docs/configuring-playbook-s3-goofys.md b/docs/configuring-playbook-s3-goofys.md index 190b74ec7..5924933d8 100644 --- a/docs/configuring-playbook-s3-goofys.md +++ b/docs/configuring-playbook-s3-goofys.md @@ -34,15 +34,13 @@ If you have local media store files and wish to migrate to Backblaze B2 subseque It's a good idea to [make a complete server backup](faq.md#how-do-i-backup-the-data-on-my-server) before migrating your local media store to an S3-backed one. -Follow one of the guides below for a migration path from a locally-stored media store to one stored on S3-compatible storage: +After making the backup, follow one of the guides below for a migration path from a locally-stored media store to one stored on S3-compatible storage: - [Migrating to any S3-compatible storage (universal, but likely slow)](#migrating-to-any-s3-compatible-storage-universal-but-likely-slow) - [Migrating to Backblaze B2](#migrating-to-backblaze-b2) ### Migrating to any S3-compatible storage (universal, but likely slow) -It's a good idea to [make a complete server backup](faq.md#how-do-i-backup-the-data-on-my-server) before doing this. - 1. Proceed with the steps below without stopping Matrix services 2. Start by adding the base S3 configuration in your `vars.yml` file (seen above, may be different depending on the S3 provider of your choice) @@ -90,8 +88,6 @@ It's a good idea to [make a complete server backup](faq.md#how-do-i-backup-the-d ### Migrating to Backblaze B2 -It's a good idea to [make a complete server backup](faq.md#how-do-i-backup-the-data-on-my-server) before doing this. - 1. While all Matrix services are running, run the following command on the server: (you need to adjust the 3 `--env` line below with your own data) From 1c0ba91a4738acd01d95092a890fc223bbdd9c95 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Fri, 25 Oct 2024 11:10:15 +0900 Subject: [PATCH 4/4] Update docs/configuring-playbook-s3-goofys.md: fix the referred step number Signed-off-by: Suguru Hirahara --- docs/configuring-playbook-s3-goofys.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/configuring-playbook-s3-goofys.md b/docs/configuring-playbook-s3-goofys.md index 5924933d8..494f96752 100644 --- a/docs/configuring-playbook-s3-goofys.md +++ b/docs/configuring-playbook-s3-goofys.md @@ -67,7 +67,7 @@ After making the backup, follow one of the guides below for a migration path fro 7. Start the S3 service by running this **on the server**: `systemctl start matrix-goofys` -8. 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 #5 9. Stop the S3 service by running this **on the server**: `systemctl stop matrix-goofys`