fix: litestream-entrypoint now takes a required BUCKET_PATH argument

NiklasRosenstein · Oct 14, 2024 · 1e75ebc · 1e75ebc
1 parent 69a680e
commit 1e75ebc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/headscale-fly-io/entrypoint.sh b/headscale-fly-io/entrypoint.sh
@@ -96,6 +96,7 @@ main() {
   write_noise_private_key
   write_config
   maybe_idle
+  export BUCKET_PATH="headscale.db"
   export LITESTREAM_DATABASE_PATH=/var/lib/headscale/db.sqlite
   info_run exec /etc/headscale/litestream-entrypoint.sh "headscale serve"
 }

diff --git a/headscale-fly-io/litestream-entrypoint.sh b/headscale-fly-io/litestream-entrypoint.sh
@@ -78,6 +78,7 @@ write_config() {
   assert_is_set AWS_REGION
   assert_is_set AWS_ENDPOINT_URL_S3
   assert_is_set BUCKET_NAME
+  assert_is_set BUCKET_PATH
   assert_is_set AGE_SECRET_KEY
   assert_is_set LITESTREAM_DATABASE_PATH
 
@@ -92,10 +93,10 @@ dbs:
   replicas:
   # See https://litestream.io/reference/config/#s3-replica
   - type: s3
-    bucket: $BUCKET_NAME
-    path: headscale.db
-    region: $AWS_REGION
-    endpoint: $AWS_ENDPOINT_URL_S3
+    bucket: "$BUCKET_NAME"
+    path: "$BUCKET_PATH"
+    region: "$AWS_REGION"
+    endpoint: '$AWS_ENDPOINT_URL_S3'
     # See https://litestream.io/reference/config/#replica-settings
     sync-interval: "${LITESTREAM_SYNC_INTERVAL:-10s}"
     # See https://litestream.io/reference/config/#encryption