luxolus
/
open-vault
2
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

Add a line to the documentation to describe the new feature

This commit is contained in:
Sander van Harmelen 2015-11-04 15:36:24 +01:00
parent c65b63d152
commit 4ad533a5ba
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
physical/s3.go
View File

@ -49,7 +49,7 @@ func newS3Backend(conf map[string]string) (Backend, error) {
}
endpoint, ok := conf["endpoint"]
if !ok {
endpoint = ""
endpoint = os.Getenv("AWS_S3_ENDPOINT")
}
region, ok := conf["region"]
if !ok {

2
website/source/docs/config/index.html.md
View File

@ -178,6 +178,8 @@ For S3, the following options are supported:
* `session_token` - (optional) The AWS session_token. It can also be sourced from the AWS_SESSION_TOKEN environment variable.
* `endpoint` - (optional) An alternative (AWS compatible) S3 endpoint to use. It can also be sourced from the AWS_S3_ENDPOINT environment variable.
* `region` (optional) - The AWS region. It can be sourced from the AWS_DEFAULT_REGION environment variable and will default to "us-east-1" if not specified.
If you are running your Vault server on an EC2 instance, you can also make use