Skip to content

Commit

Permalink
s3: Add --s3-force-path-style - fixes #2401
Browse files Browse the repository at this point in the history
  • Loading branch information
ncw committed Jul 18, 2018
1 parent b1f31c2 commit 56eeebc
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
8 changes: 7 additions & 1 deletion backend/s3/s3.go
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,11 @@ func init() {
Help: "Concurrency for multipart uploads.",
Default: 2,
Advanced: true,
}, {
Name: "force_path_style",
Help: "If true use path style access if false use virtual hosted style.\nSome providers (eg Aliyun OSS or Netease COS) require this.",
Default: true,
Advanced: true,
}},
})
}
Expand Down Expand Up @@ -569,6 +574,7 @@ type Options struct {
DisableChecksum bool `config:"disable_checksum"`
SessionToken string `config:"session_token"`
UploadConcurrency int `config:"upload_concurrency"`
ForcePathStyle bool `config:"force_path_style"`
}

// Fs represents a remote s3 server
Expand Down Expand Up @@ -707,7 +713,7 @@ func s3Connection(opt *Options) (*s3.S3, *session.Session, error) {
WithCredentials(cred).
WithEndpoint(opt.Endpoint).
WithHTTPClient(fshttp.NewClient(fs.Config)).
WithS3ForcePathStyle(true)
WithS3ForcePathStyle(opt.ForcePathStyle)
// awsConfig.WithLogLevel(aws.LogDebugWithSigning)
ses := session.New()
c := s3.New(ses, awsConfig)
Expand Down
10 changes: 10 additions & 0 deletions docs/content/s3.md
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,16 @@ Note that 2 chunks of this size are buffered in memory per transfer.
If you are transferring large files over high speed links and you have
enough memory, then increasing this will speed up the transfers.

#### --s3-force-path-style=BOOL ####

If this is true (the default) then rclone will use path style access,
if false then rclone will use virtual path style. See [the AWS S3
docs](https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingBucket.html#access-bucket-intro)
for more info.

Some providers (eg Aliyun OSS or Netease COS) require this set to
`false`. It can also be set in the config in the advanced section.

#### --s3-upload-concurrency ####

Number of chunks of the same file that are uploaded concurrently.
Expand Down

0 comments on commit 56eeebc

Please sign in to comment.