Skip to content

Commit

Permalink
Merge branch 'hotfix/1.5.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisnharvey committed Jan 22, 2021
2 parents d76f0db + 2caacbe commit 95abfd2
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

## [Unreleased](https://github.com/chrisnharvey/magicLAMP/compare/master...develop)

# v.1.5.1

### Fixed

- Update docs to include endpoint for S3 server

# v1.5.0

### New
Expand Down
9 changes: 8 additions & 1 deletion docs/s3/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ magicLAMP includes a local S3-compatible object storage server powered by
will store files in S3 as it allows you to use the same APIs that you
will use in production as well as support for pre-signed URLs.

**S3 Endpoint:** s3.localhost

## Accessing the GUI

MinIO has a built-in GUI which you can access at `s3.localhost`. Here you
can create buckets, manage and upload files and more.

## Authentication

You can configure the access key and secret used to access the S3 server in the
Expand All @@ -15,4 +22,4 @@ You can configure the access key and secret used to access the S3 server in the
You can change where files uploaded to your local S3 server are stored in the
`.env` file, under `S3_DATA_DIR`.

By default, files will be stored in `data/s3`.
By default, files will be stored in `data/s3`.

0 comments on commit 95abfd2

Please sign in to comment.