diff options
| author | Alex Auvolat <alex@adnab.me> | 2023-10-03 18:40:37 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2023-10-03 18:40:37 +0200 |
| commit | 2e656b541b1dd1492798e1ed764fa40868da4d6a (patch) | |
| tree | 66fbf4c11a248d3c92cf44c4d3f18663670acbbe /doc/book/connect | |
| parent | 9ac1d5be0eba1b3b35f7fb2f99fe8df549044197 (diff) | |
| parent | 1243db87f2090a3302c7c8beb386e68ddf9b66b5 (diff) | |
| download | garage-2e656b541b1dd1492798e1ed764fa40868da4d6a.tar.gz garage-2e656b541b1dd1492798e1ed764fa40868da4d6a.zip | |
Merge branch 'main' into nextv0.9.0-rc1
Diffstat (limited to 'doc/book/connect')
| -rw-r--r-- | doc/book/connect/apps/index.md | 4 | ||||
| -rw-r--r-- | doc/book/connect/cli.md | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/doc/book/connect/apps/index.md b/doc/book/connect/apps/index.md index 7bad9d09..f67a29c9 100644 --- a/doc/book/connect/apps/index.md +++ b/doc/book/connect/apps/index.md @@ -421,7 +421,7 @@ Now we can write a simple script (eg `~/.local/bin/matrix-cache-gc`): ## CONFIGURATION ## AWS_ACCESS_KEY_ID=GKxxx AWS_SECRET_ACCESS_KEY=xxxx -S3_ENDPOINT=http://localhost:3900 +AWS_ENDPOINT_URL=http://localhost:3900 S3_BUCKET=matrix MEDIA_STORE=/var/lib/matrix-synapse/media PG_USER=matrix @@ -442,7 +442,7 @@ EOF s3_media_upload update-db 1d s3_media_upload --no-progress check-deleted $MEDIA_STORE -s3_media_upload --no-progress upload $MEDIA_STORE $S3_BUCKET --delete --endpoint-url $S3_ENDPOINT +s3_media_upload --no-progress upload $MEDIA_STORE $S3_BUCKET --delete --endpoint-url $AWS_ENDPOINT_URL ``` This script will list all the medias that were not accessed in the 24 hours according to your database. diff --git a/doc/book/connect/cli.md b/doc/book/connect/cli.md index 591ac151..c9ffd4f4 100644 --- a/doc/book/connect/cli.md +++ b/doc/book/connect/cli.md @@ -70,16 +70,17 @@ Then a file named `~/.aws/config` and put: ```toml [default] region=garage +endpoint_url=http://127.0.0.1:3900 ``` Now, supposing Garage is listening on `http://127.0.0.1:3900`, you can list your buckets with: ```bash -aws --endpoint-url http://127.0.0.1:3900 s3 ls +aws s3 ls ``` -Passing the `--endpoint-url` parameter to each command is annoying but AWS developers do not provide a corresponding configuration entry. -As a workaround, you can redefine the aws command by editing the file `~/.bashrc`: +If you're using awscli `<1.29.0` or `<2.13.0`, you need to pass `--endpoint-url` to each CLI invocation explicitly. +As a workaround, you can redefine the aws command by editing the file `~/.bashrc` in this case: ``` function aws { command aws --endpoint-url http://127.0.0.1:3900 $@ ; } |