octoleo
/
restic
mirror of https://github.com/octoleo/restic.git
2
2
Fork 0
Code Issues Releases Wiki Activity

Rename environment variable to AWS_DEFAULT_REGION 

This seems to be the correct name, at least the AWS cli uses it:
https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-envvars.html
This commit is contained in:
Alexander Neumann 2019-11-22 15:24:42 +01:00
parent 4cadc89ad3
commit fb95426f64
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changelog/unreleased/pull-2350
View File

@ -2,7 +2,7 @@ Enhancement: Add option to configure S3 region
We've added a new option for setting the region when accessing an S3-compatible We've added a new option for setting the region when accessing an S3-compatible
service. For some providers, it is required to set this to a valid value. You service. For some providers, it is required to set this to a valid value. You
can do that either by setting the environment variable `AWS_REGION` or using can do that either by setting the environment variable `AWS_DEFAULT_REGION` or
the option `s3.region`, e.g. like this: `-o s3.region="us-east-1"`. using the option `s3.region`, e.g. like this: `-o s3.region="us-east-1"`.
https://github.com/restic/restic/pull/2350 https://github.com/restic/restic/pull/2350

2
cmd/restic/global.go
View File

@ -486,7 +486,7 @@ func parseConfig(loc location.Location, opts options.Options) (interface{}, erro
} }
if cfg.Region == "" { if cfg.Region == "" {
cfg.Region = os.Getenv("AWS_REGION") cfg.Region = os.Getenv("AWS_DEFAULT_REGION")
} }
if err := opts.Apply(loc.Scheme, &cfg); err != nil { if err := opts.Apply(loc.Scheme, &cfg); err != nil {

8
doc/030_preparing_a_new_repo.rst
View File

@ -198,10 +198,10 @@ default location:
Losing your password means that your data is irrecoverably lost. Losing your password means that your data is irrecoverably lost.
If needed, you can manually specify the region to use by either setting the If needed, you can manually specify the region to use by either setting the
environment variable ``AWS_REGION`` or calling restic with an option parameter environment variable ``AWS_DEFAULT_REGION`` or calling restic with an option
like ``-o s3.region="us-east-1"``. If the region is not specified, the default parameter like ``-o s3.region="us-east-1"``. If the region is not specified,
region is used. Afterwards, the S3 server (``s3.amazonaws.com``) will redirect the default region is used. Afterwards, the S3 server (at least for AWS,
restic to the correct endpoint. ``s3.amazonaws.com``) will redirect restic to the correct endpoint.
Until version 0.8.0, restic used a default prefix of ``restic``, so the files Until version 0.8.0, restic used a default prefix of ``restic``, so the files
in the bucket were placed in a directory named ``restic``. If you want to in the bucket were placed in a directory named ``restic``. If you want to