diff --git a/README.md b/README.md index 147c756..00e883a 100644 --- a/README.md +++ b/README.md @@ -191,11 +191,11 @@ Your Organization will be mapped to `DB_USER` and your root token will need to b If `BACKUP_LOCATION` = `S3` then the following options are used. | Parameter | Description | Default | -| --------------------- | ----------------------------------------------------------------------------------------- | ------- | +|-----------------------|-------------------------------------------------------------------------------------------|---------| | `S3_BUCKET` | S3 Bucket name e.g. `mybucket` | | | `S3_KEY_ID` | S3 Key ID | | | `S3_KEY_SECRET` | S3 Key Secret | | -| `S3_PATH` | S3 Pathname to save to e.g. '`backup`' | | +| `S3_PATH` | S3 Pathname to save to (must end in a trailing slash e.g. '`backup/`') | | | `S3_REGION` | Define region in which bucket is defined. Example: `ap-northeast-2` | | | `S3_HOST` | Hostname (and port) of S3-compatible service, e.g. `minio:8080`. Defaults to AWS. | | | `S3_PROTOCOL` | Protocol to connect to `S3_HOST`. Either `http` or `https`. Defaults to `https`. | `https` | diff --git a/install/assets/functions/10-db-backup b/install/assets/functions/10-db-backup index 8de2d0b..1702cf1 100755 --- a/install/assets/functions/10-db-backup +++ b/install/assets/functions/10-db-backup @@ -469,7 +469,7 @@ cleanup_old_data() { s3_filename=$(echo $s3_file | awk {'print $4'}) if [ "$s3_filename" != "" ] ; then print_debug "Deleting $s3_filename" - silent aws ${PARAM_AWS_ENDPOINT_URL} s3 rm s3://${S3_BUCKET}/${S3_PATH}/${s3_filename} ${s3_ssl} ${s3_ca_cert} ${S3_EXTRA_OPTS} + silent aws ${PARAM_AWS_ENDPOINT_URL} s3 rm s3://${S3_BUCKET}/${S3_PATH}${s3_filename} ${s3_ssl} ${s3_ca_cert} ${S3_EXTRA_OPTS} fi fi