Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Update backup documentation and configuration for Backblaze B2 integration

Bill Yanga2501d3eecfa
diff --git a/ops/backups/README.md b/ops/backups/README.md
index ed90ec835..e290c81eb 100644
--- a/ops/backups/README.md
+++ b/ops/backups/README.md
@@ -33,11 +33,10 @@ sudo rclone config
sudo chmod 600 /root/.config/rclone/rclone.conf
```
-The examples use an rclone `crypt` remote named `b2crypt` over a B2 remote.
-This provides client-side encryption in addition to B2 server-side encryption.
-The direct FrogStats ClickHouse backup uses B2 server-side encryption because
-it is written directly through ClickHouse's S3-compatible client. Its B2
-credentials live in a ClickHouse named collection rather than the backup SQL.
+The examples use a Backblaze remote named `b2`. Data is protected in transit by
+TLS and at rest by B2 server-side encryption. The direct FrogStats ClickHouse
+backup is written through ClickHouse's S3-compatible client. Its B2 credentials
+live in a ClickHouse named collection rather than the backup SQL.
## Install on each host
@@ -172,8 +171,8 @@ Object Lock is enabled. Never add an Object-Locked B2 remote to
Always restore into a disposable container or a differently named database
first. Never test a restore against production.
-For PostgreSQL, download one backup directory through the crypt remote, verify
-it, restore globals, and then restore the custom archive:
+For PostgreSQL, download one backup directory through the B2 remote, verify it,
+restore globals, and then restore the custom archive:
```bash
cd /var/tmp/postgres-restore
diff --git a/ops/backups/config/clickhouse.env.example b/ops/backups/config/clickhouse.env.example
index 48c378f99..f3f876694 100644
--- a/ops/backups/config/clickhouse.env.example
+++ b/ops/backups/config/clickhouse.env.example
@@ -10,9 +10,8 @@ CLICKHOUSE_LOCAL_BACKUP_ROOT=/var/backups/rybbit/clickhouse
CLICKHOUSE_KEEP_LOCAL_BACKUP=false
# The same completed native snapshot is copied to both providers. Configure
-# these names in root's /root/.config/rclone/rclone.conf. Use an rclone crypt
-# wrapper for B2 if client-side encryption is required.
-CLICKHOUSE_RCLONE_REMOTES=hetzner:clickhouse-backups,b2crypt:rybbit-db-backups/clickhouse/analytics
+# these names in root's /root/.config/rclone/rclone.conf.
+CLICKHOUSE_RCLONE_REMOTES=hetzner:clickhouse-backups,b2:rybbit-db-backups/clickhouse/analytics
# Hetzner does not have B2 lifecycle rules, so prune it from the host. Do not
# include the Object-Locked B2 remote here; let B2 lifecycle rules expire it.
diff --git a/ops/backups/config/frogstats.env.example b/ops/backups/config/frogstats.env.example
index f90d25b92..881dc9971 100644
--- a/ops/backups/config/frogstats.env.example
+++ b/ops/backups/config/frogstats.env.example
@@ -2,11 +2,11 @@
BACKUP_HOST=frogstats
-# PostgreSQL: rclone should use a crypt remote backed by the private B2 bucket.
+# PostgreSQL: upload through the Backblaze B2 rclone remote.
POSTGRES_CONTAINER=postgres
POSTGRES_DATABASE=analytics
POSTGRES_STAGING_ROOT=/var/backups/rybbit/postgres
-POSTGRES_RCLONE_REMOTES=b2crypt:rybbit-db-backups/frogstats/postgres
+POSTGRES_RCLONE_REMOTES=b2:rybbit-db-backups/frogstats/postgres
# ClickHouse: direct native backup avoids staging ~58 GiB on this host.
CLICKHOUSE_CONTAINER=clickhouse
diff --git a/ops/backups/config/rybbit.env.example b/ops/backups/config/rybbit.env.example
index d92435239..8420664c2 100644
--- a/ops/backups/config/rybbit.env.example
+++ b/ops/backups/config/rybbit.env.example
@@ -5,11 +5,10 @@ BACKUP_HOST=rybbit
POSTGRES_CONTAINER=postgres
POSTGRES_DATABASE=analytics
POSTGRES_STAGING_ROOT=/var/backups/rybbit/postgres
-POSTGRES_RCLONE_REMOTES=b2crypt:rybbit-db-backups/rybbit/postgres
+POSTGRES_RCLONE_REMOTES=b2:rybbit-db-backups/rybbit/postgres
# No ClickHouse backup is configured here. The backend uses the standalone
# ClickHouse host rather than this host's effectively empty local volume.
# POSTGRES_SUCCESS_URL=
# POSTGRES_FAILURE_URL=
-