TrueCloudLab/rclone
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions 1

s3: add other regions for Lyve and correct Provider name

Browse source
This commit is contained in:
Nick Craig-Wood 2022-03-14 15:37:34 +00:00
parent 69f726f16c
commit 189cba0fbe
2 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
backend/s3/s3.go
View file

@ -58,7 +58,7 @@ import (
func init() { func init() {
fs.Register(&fs.RegInfo{ fs.Register(&fs.RegInfo{
Name: "s3", Name: "s3",
Description: "Amazon S3 Compliant Storage Providers including AWS, Alibaba, Ceph, Digital Ocean, Dreamhost, IBM COS, Minio, RackCorp, SeaweedFS, and Tencent COS", Description: "Amazon S3 Compliant Storage Providers including AWS, Alibaba, Ceph, Digital Ocean, Dreamhost, IBM COS, Lyve Cloud, Minio, RackCorp, SeaweedFS, and Tencent COS",
NewFs: NewFs, NewFs: NewFs,
CommandHelp: commandHelp, CommandHelp: commandHelp,
Options: []fs.Option{{ Options: []fs.Option{{
@ -85,7 +85,7 @@ func init() {
Value: "IBMCOS", Value: "IBMCOS",
Help: "IBM COS S3", Help: "IBM COS S3",
}, { }, {
Value: "Lyve", Value: "LyveCloud",
Help: "Seagate Lyve Cloud", Help: "Seagate Lyve Cloud",
}, { }, {
Value: "Minio", Value: "Minio",
@ -769,8 +769,16 @@ func init() {
Provider: "SeaweedFS", Provider: "SeaweedFS",
}, { }, {
Value: "s3.us-east-1.lyvecloud.seagate.com", Value: "s3.us-east-1.lyvecloud.seagate.com",
Help: "Seagate Lyve Cloud US East 1", Help: "Seagate Lyve Cloud US East 1 (Virginia)",
Provider: "Lyve", Provider: "LyveCloud",
}, {
Value: "s3.us-west-1.lyvecloud.seagate.com",
Help: "Seagate Lyve Cloud US West 1 (California)",
Provider: "LyveCloud",
}, {
Value: "s3.ap-southeast-1.lyvecloud.seagate.com",
Help: "Seagate Lyve Cloud AP Southeast 1 (Singapore)",
Provider: "LyveCloud",
}, { }, {
Value: "s3.wasabisys.com", Value: "s3.wasabisys.com",
Help: "Wasabi US East endpoint", Help: "Wasabi US East endpoint",
@ -1951,8 +1959,8 @@ func setQuirks(opt *Options) {
virtualHostStyle = false virtualHostStyle = false
urlEncodeListings = false urlEncodeListings = false
useMultipartEtag = false // untested useMultipartEtag = false // untested
case "Lyve": case "LyveCloud":
useMultipartEtag = false // Lyve seems to calculate multipart Etags differently from AWS useMultipartEtag = false // LyveCloud seems to calculate multipart Etags differently from AWS
case "Minio": case "Minio":
virtualHostStyle = false virtualHostStyle = false
case "Netease": case "Netease":

18
docs/content/s3.md
View file

@ -2435,13 +2435,13 @@ Choose `s3` backend
Type of storage to configure. Type of storage to configure.
Choose a number from below, or type in your own value. Choose a number from below, or type in your own value.
[snip] [snip]
XX / Amazon S3 Compliant Storage Providers including AWS, Alibaba, Ceph, Digital Ocean, Dreamhost, IBM COS, Minio, RackCorp, SeaweedFS, and Tencent COS XX / Amazon S3 Compliant Storage Providers including AWS, Alibaba, Ceph, Digital Ocean, Dreamhost, IBM COS, Lyve Cloud, Minio, RackCorp, SeaweedFS, and Tencent COS
\ (s3) \ (s3)
[snip] [snip]
Storage> s3 Storage> s3
``` ```
Choose `Lyve` as S3 provider Choose `LyveCloud` as S3 provider
``` ```
Choose your S3 provider. Choose your S3 provider.
@ -2449,9 +2449,9 @@ Choose a number from below, or type in your own value.
Press Enter to leave empty. Press Enter to leave empty.
[snip] [snip]
XX / Seagate Lyve Cloud XX / Seagate Lyve Cloud
\ (Lyve) \ (LyveCloud)
[snip] [snip]
provider> Lyve provider> LyveCloud
``` ```
Take the default (just press enter) to enter access key and secret in the config file. Take the default (just press enter) to enter access key and secret in the config file.
@ -2505,12 +2505,16 @@ Endpoint for S3 API.
Required when using an S3 clone. Required when using an S3 clone.
Choose a number from below, or type in your own value. Choose a number from below, or type in your own value.
Press Enter to leave empty. Press Enter to leave empty.
1 / Seagate Lyve Cloud US East 1 1 / Seagate Lyve Cloud US East 1 (Virginia)
\ (s3.us-east-1.lyvecloud.seagate.com) \ (s3.us-east-1.lyvecloud.seagate.com)
2 / Seagate Lyve Cloud US West 1 (California)
\ (s3.us-west-1.lyvecloud.seagate.com)
3 / Seagate Lyve Cloud AP Southeast 1 (Singapore)
\ (s3.ap-southeast-1.lyvecloud.seagate.com)
endpoint> 1 endpoint> 1
``` ```
Leave location constraing blank Leave location constraint blank
``` ```
Location constraint - must be set to match the Region. Location constraint - must be set to match the Region.
@ -2541,7 +2545,7 @@ And the config file should end up looking like this:
``` ```
[remote] [remote]
type = s3 type = s3
provider = Lyve provider = LyveCloud
access_key_id = XXX access_key_id = XXX
secret_access_key = YYY secret_access_key = YYY
endpoint = s3.us-east-1.lyvecloud.seagate.com endpoint = s3.us-east-1.lyvecloud.seagate.com